diff --git a/sharing/nearby_sharing_service_factory.cc b/sharing/nearby_sharing_service_factory.cc index 63d1ea50..11e595ef 100644 --- a/sharing/nearby_sharing_service_factory.cc +++ b/sharing/nearby_sharing_service_factory.cc @@ -70,7 +70,6 @@ NearbySharingService* NearbySharingServiceFactory::CreateSharingService( nearby_sharing_service_ = std::make_unique( std::move(service_thread), context_.get(), sharing_platform, nearby_identity_client_.get(), - nearby_share_client_.get(), std::move(nearby_connections_manager), std::move(nearby_share_contact_manager), analytics_recorder, supports_file_sync); diff --git a/sharing/nearby_sharing_service_impl.cc b/sharing/nearby_sharing_service_impl.cc index 2ceb0496..cef76c23 100644 --- a/sharing/nearby_sharing_service_impl.cc +++ b/sharing/nearby_sharing_service_impl.cc @@ -114,7 +114,6 @@ using ::location::nearby::proto::sharing::OSType; using ::location::nearby::proto::sharing::ResponseToIntroduction; using ::location::nearby::proto::sharing::SessionStatus; using ::nearby::sharing::api::SharingPlatform; -using ::nearby::sharing::api::SharingRpcClient; using ::nearby::sharing::api::IdentityRpcClient; using ::nearby::sharing::proto::DataUsage; using ::nearby::sharing::proto::DeviceVisibility; @@ -238,7 +237,6 @@ NearbySharingServiceImpl::NearbySharingServiceImpl( SharingPlatform& sharing_platform, nearby::sharing::api::IdentityRpcClient* absl_nonnull nearby_identity_client, - nearby::sharing::api::SharingRpcClient* absl_nonnull nearby_share_client, std::unique_ptr nearby_connections_manager, std::unique_ptr contact_manager, analytics::AnalyticsRecorder* analytics_recorder, bool supports_file_sync) @@ -250,7 +248,7 @@ NearbySharingServiceImpl::NearbySharingServiceImpl( analytics_recorder_(*analytics_recorder), supports_file_sync_(supports_file_sync), nearby_connections_manager_(std::move(nearby_connections_manager)), - nearby_share_client_(nearby_share_client), + nearby_identity_client_(nearby_identity_client), local_device_data_manager_( NearbyShareLocalDeviceDataManagerImpl::Factory::Create( preference_manager_, account_manager_, device_info_)), diff --git a/sharing/nearby_sharing_service_impl.h b/sharing/nearby_sharing_service_impl.h index d93bc24e..fc3eeae8 100644 --- a/sharing/nearby_sharing_service_impl.h +++ b/sharing/nearby_sharing_service_impl.h @@ -106,7 +106,6 @@ class NearbySharingServiceImpl nearby::sharing::api::SharingPlatform& sharing_platform, nearby::sharing::api::IdentityRpcClient* absl_nonnull nearby_identity_client, - nearby::sharing::api::SharingRpcClient* absl_nonnull nearby_share_client, std::unique_ptr nearby_connections_manager, std::unique_ptr contact_manager, analytics::AnalyticsRecorder* analytics_recorder, @@ -418,8 +417,8 @@ class NearbySharingServiceImpl const bool supports_file_sync_; std::unique_ptr nearby_connections_manager_; - nearby::sharing::api::SharingRpcClient* absl_nonnull const - nearby_share_client_; + nearby::sharing::api::IdentityRpcClient* absl_nonnull const + nearby_identity_client_; std::unique_ptr local_device_data_manager_; std::unique_ptr contact_manager_; std::unique_ptr certificate_manager_; diff --git a/sharing/nearby_sharing_service_impl_test.cc b/sharing/nearby_sharing_service_impl_test.cc index aaf1624c..4a12ad4b 100644 --- a/sharing/nearby_sharing_service_impl_test.cc +++ b/sharing/nearby_sharing_service_impl_test.cc @@ -484,7 +484,7 @@ class NearbySharingServiceImplTest : public testing::Test { std::unique_ptr task_runner) { return std::make_unique( std::move(task_runner), &fake_context_, mock_sharing_platform_, - &nearby_identity_client_, &nearby_share_client_, + &nearby_identity_client_, absl::WrapUnique(fake_nearby_connections_manager_), absl::WrapUnique(contact_manager_), analytics_recorder_.get(), /*supports_file_sync=*/false); @@ -1280,7 +1280,6 @@ class NearbySharingServiceImplTest : public testing::Test { std::queue written_payloads_ ABSL_GUARDED_BY(connection_output_mutex_); FakeNearbyIdentityClient nearby_identity_client_; - FakeNearbyShareClient nearby_share_client_; }; struct ValidSendSurfaceTestData {