From 0c69a1bca172dbbb2ee9dfccacd4d78d926de807 Mon Sep 17 00:00:00 2001 From: Francis Tsui Date: Fri, 20 Dec 2024 11:57:27 -0800 Subject: [PATCH] Remove endpointID from NearbyConnectionImpl. PiperOrigin-RevId: 708387403 --- sharing/incoming_frames_reader_test.cc | 4 +-- sharing/incoming_share_session_test.cc | 2 +- sharing/nearby_connection_impl.cc | 8 ++--- sharing/nearby_connection_impl.h | 6 +--- sharing/nearby_connection_impl_test.cc | 4 +-- sharing/nearby_connections_manager_impl.cc | 5 ++- sharing/nearby_sharing_service_impl_test.cc | 3 +- sharing/outgoing_share_session_test.cc | 35 ++++++++++--------- .../paired_key_verification_runner_test.cc | 2 +- sharing/share_session_test.cc | 26 +++++++------- 10 files changed, 43 insertions(+), 52 deletions(-) diff --git a/sharing/incoming_frames_reader_test.cc b/sharing/incoming_frames_reader_test.cc index 0e683429..d0f78654 100644 --- a/sharing/incoming_frames_reader_test.cc +++ b/sharing/incoming_frames_reader_test.cc @@ -100,8 +100,8 @@ std::optional> GetInvalidFrame() { class IncomingFramesReaderTest : public testing::Test { public: IncomingFramesReaderTest() { - nearby_connection_ = std::make_unique( - fake_device_info_, "endpoint_id"); + nearby_connection_ = + std::make_unique(fake_device_info_); } ~IncomingFramesReaderTest() override = default; diff --git a/sharing/incoming_share_session_test.cc b/sharing/incoming_share_session_test.cc index 88ac55e1..68826e6e 100644 --- a/sharing/incoming_share_session_test.cc +++ b/sharing/incoming_share_session_test.cc @@ -116,7 +116,7 @@ std::unique_ptr CreateWifiCredentialsPayload( class IncomingShareSessionTest : public ::testing::Test { protected: IncomingShareSessionTest() - : connection_(device_info_, kEndpointId), + : connection_(device_info_), session_(&clock_, task_runner_, &connections_manager_, analytics_recorder_, std::string(kEndpointId), share_target_, transfer_metadata_callback_.AsStdFunction()) { diff --git a/sharing/nearby_connection_impl.cc b/sharing/nearby_connection_impl.cc index fc92b11e..d918c5a0 100644 --- a/sharing/nearby_connection_impl.cc +++ b/sharing/nearby_connection_impl.cc @@ -18,21 +18,17 @@ #include #include #include -#include #include #include -#include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" #include "internal/platform/device_info.h" #include "sharing/internal/public/logging.h" namespace nearby::sharing { -NearbyConnectionImpl::NearbyConnectionImpl(nearby::DeviceInfo& device_info, - absl::string_view endpoint_id) - : device_info_(device_info), - endpoint_id_(endpoint_id) { +NearbyConnectionImpl::NearbyConnectionImpl(nearby::DeviceInfo& device_info) + : device_info_(device_info) { if (!device_info_.PreventSleep()) { LOG(WARNING) << __func__ << ":Failed to prevent device sleep."; } diff --git a/sharing/nearby_connection_impl.h b/sharing/nearby_connection_impl.h index 370b5088..35725791 100644 --- a/sharing/nearby_connection_impl.h +++ b/sharing/nearby_connection_impl.h @@ -19,11 +19,9 @@ #include #include #include -#include #include #include "absl/base/thread_annotations.h" -#include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" #include "internal/platform/device_info.h" #include "sharing/nearby_connection.h" @@ -34,8 +32,7 @@ class NearbyConnectionsManager; class NearbyConnectionImpl : public NearbyConnection { public: - NearbyConnectionImpl(nearby::DeviceInfo& device_info, - absl::string_view endpoint_id); + explicit NearbyConnectionImpl(nearby::DeviceInfo& device_info); ~NearbyConnectionImpl() override; // NearbyConnection: @@ -50,7 +47,6 @@ class NearbyConnectionImpl : public NearbyConnection { private: nearby::DeviceInfo& device_info_; - const std::string endpoint_id_; absl::Mutex mutex_; std::function> bytes)> read_callback_ diff --git a/sharing/nearby_connection_impl_test.cc b/sharing/nearby_connection_impl_test.cc index 69b40994..3ea55c63 100644 --- a/sharing/nearby_connection_impl_test.cc +++ b/sharing/nearby_connection_impl_test.cc @@ -35,7 +35,7 @@ TEST(NearbyConnectionImpl, DestructorBeforeReaderDestructor) { FakeDeviceInfo device_info; bool called = false; - auto connection = std::make_unique(device_info, "test"); + auto connection = std::make_unique(device_info); auto frames_reader = std::make_shared(fake_task_runner, connection.get()); @@ -57,7 +57,7 @@ TEST(NearbyConnectionImpl, DestructorAfterReaderDestructor) { FakeDeviceInfo device_info; std::optional frame_result; - auto connection = std::make_unique(device_info, "test"); + auto connection = std::make_unique(device_info); auto frames_reader = std::make_shared(fake_task_runner, connection.get()); diff --git a/sharing/nearby_connections_manager_impl.cc b/sharing/nearby_connections_manager_impl.cc index e5a7a19d..83d9e03a 100644 --- a/sharing/nearby_connections_manager_impl.cc +++ b/sharing/nearby_connections_manager_impl.cc @@ -691,7 +691,7 @@ void NearbyConnectionsManagerImpl::OnConnectionAccepted( auto result = connections_.emplace( std::string(endpoint_id), - std::make_unique(device_info_, endpoint_id)); + std::make_unique(device_info_)); DCHECK(result.second); incoming_connection_listener_->OnIncomingConnection( endpoint_id, it->second.endpoint_info, result.first->second.get()); @@ -703,8 +703,7 @@ void NearbyConnectionsManagerImpl::OnConnectionAccepted( } auto result = connections_.emplace( - endpoint_id, - std::make_unique(device_info_, endpoint_id)); + endpoint_id, std::make_unique(device_info_)); DCHECK(result.second); std::move(it->second)(endpoint_id, result.first->second.get(), Status::kSuccess); diff --git a/sharing/nearby_sharing_service_impl_test.cc b/sharing/nearby_sharing_service_impl_test.cc index 5133a38e..c0203e7c 100644 --- a/sharing/nearby_sharing_service_impl_test.cc +++ b/sharing/nearby_sharing_service_impl_test.cc @@ -427,8 +427,7 @@ class NearbySharingServiceImplTest : public testing::Test { std::make_unique(fake_context_.fake_clock(), 1); sharing_service_task_runner_ = fake_task_runner.get(); fake_nearby_connections_manager_ = new FakeNearbyConnectionsManager(); - connection_ = - std::make_unique(fake_device_info_, kEndpointId); + connection_ = std::make_unique(fake_device_info_); fake_nearby_connections_manager_->set_send_payload_callback( [this](std::unique_ptr payload, std::weak_ptr diff --git a/sharing/outgoing_share_session_test.cc b/sharing/outgoing_share_session_test.cc index 4e20834d..b787e31b 100644 --- a/sharing/outgoing_share_session_test.cc +++ b/sharing/outgoing_share_session_test.cc @@ -38,6 +38,7 @@ #include "sharing/common/nearby_share_enums.h" #include "sharing/fake_nearby_connections_manager.h" #include "sharing/file_attachment.h" +#include "sharing/nearby_connection.h" #include "sharing/nearby_connection_impl.h" #include "sharing/nearby_connections_manager.h" #include "sharing/nearby_connections_types.h" @@ -291,7 +292,7 @@ TEST_F(OutgoingShareSessionTest, ConnectNoDisableWifiHotspot) { std::vector bluetooth_mac_address = {5, 6, 7, 8}; file1_.set_size(1000000); // 1MB InitSendAttachments(CreateDefaultAttachmentContainer()); - NearbyConnectionImpl nearby_connection(device_info_, kEndpointId); + NearbyConnectionImpl nearby_connection(device_info_); connections_manager_.set_nearby_connection(&nearby_connection); session_.Connect( @@ -319,7 +320,7 @@ TEST_F(OutgoingShareSessionTest, ConnectDisableWifiHotspot) { std::vector bluetooth_mac_address = {5, 6, 7, 8}; file1_.set_size(1000000); // 1MB InitSendAttachments(CreateDefaultAttachmentContainer()); - NearbyConnectionImpl nearby_connection(device_info_, kEndpointId); + NearbyConnectionImpl nearby_connection(device_info_); connections_manager_.set_nearby_connection(&nearby_connection); session_.Connect( @@ -347,7 +348,7 @@ TEST_F(OutgoingShareSessionTest, OnConnectResultSuccessLogsSessionDuration) { session_.set_session_id(1234); std::vector endpoint_info = {1, 2, 3, 4}; std::vector bluetooth_mac_address = {5, 6, 7, 8}; - NearbyConnectionImpl nearby_connection(device_info_, kEndpointId); + NearbyConnectionImpl nearby_connection(device_info_); connections_manager_.set_nearby_connection(&nearby_connection); session_.Connect( endpoint_info, bluetooth_mac_address, @@ -414,7 +415,7 @@ TEST_F(OutgoingShareSessionTest, SendIntroductionWithoutPayloads) { TEST_F(OutgoingShareSessionTest, SendIntroductionSuccess) { InitSendAttachments(CreateDefaultAttachmentContainer()); session_.set_session_id(1234); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); ConnectionSuccess(&connection); std::vector file_infos; file_infos.push_back({ @@ -494,7 +495,7 @@ TEST_F(OutgoingShareSessionTest, SendIntroductionTimeout) { std::vector{}); InitSendAttachments(std::move(container)); session_.set_session_id(1234); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); ConnectionSuccess(&connection); session_.CreateTextPayloads(); EXPECT_CALL( @@ -521,7 +522,7 @@ TEST_F(OutgoingShareSessionTest, SendIntroductionTimeoutCancelled) { std::vector{}); InitSendAttachments(std::move(container)); session_.set_session_id(1234); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); ConnectionSuccess(&connection); session_.CreateTextPayloads(); EXPECT_CALL( @@ -557,7 +558,7 @@ TEST_F(OutgoingShareSessionTest, AcceptTransferNotConnected) { } TEST_F(OutgoingShareSessionTest, AcceptTransferNotReady) { - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); session_.set_session_id(1234); ConnectionSuccess(&connection); @@ -572,7 +573,7 @@ TEST_F(OutgoingShareSessionTest, AcceptTransferSuccess) { std::vector{}); InitSendAttachments(std::move(container)); session_.set_session_id(1234); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); ConnectionSuccess(&connection); session_.CreateTextPayloads(); EXPECT_CALL( @@ -663,7 +664,7 @@ TEST_F(OutgoingShareSessionTest, HandleConnectionResponseTimeoutResponse) { TEST_F(OutgoingShareSessionTest, HandleConnectionResponseAcceptResponse) { ConnectionResponseFrame response; response.set_status(ConnectionResponseFrame::ACCEPT); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); session_.set_session_id(1234); ConnectionSuccess(&connection); EXPECT_CALL(transfer_metadata_callback_, @@ -724,7 +725,7 @@ TEST_F(OutgoingShareSessionTest, SendPayloadsDisableCancellationOptimization) { HasEventType(EventType::SEND_ATTACHMENTS_START), Property(&SharingLog::send_attachments_start, HasSessionId(1234))))))); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); ConnectionSuccess(&connection); session_.SendPayloads( @@ -767,7 +768,7 @@ TEST_F(OutgoingShareSessionTest, SendPayloadsEnableCancellationOptimization) { HasEventType(EventType::SEND_ATTACHMENTS_START), Property(&SharingLog::send_attachments_start, HasSessionId(1234))))))); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); ConnectionSuccess(&connection); session_.SendPayloads( @@ -811,7 +812,7 @@ TEST_F(OutgoingShareSessionTest, SendNextPayload) { HasEventType(EventType::SEND_ATTACHMENTS_START), Property(&SharingLog::send_attachments_start, HasSessionId(1234))))))); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); ConnectionSuccess(&connection); session_.SendPayloads( @@ -848,7 +849,7 @@ TEST_F(OutgoingShareSessionTest, SendNextPayload) { } TEST_F(OutgoingShareSessionTest, ProcessKeyVerificationResultFail) { - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); session_.set_session_id(1234); ConnectionSuccess(&connection); session_.SetTokenForTests("1234"); @@ -864,7 +865,7 @@ TEST_F(OutgoingShareSessionTest, ProcessKeyVerificationResultFail) { } TEST_F(OutgoingShareSessionTest, ProcessKeyVerificationResultSuccess) { - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); session_.set_session_id(1234); ConnectionSuccess(&connection); session_.SetTokenForTests("1234"); @@ -880,7 +881,7 @@ TEST_F(OutgoingShareSessionTest, ProcessKeyVerificationResultSuccess) { } TEST_F(OutgoingShareSessionTest, DelayCompleteMetadataReceiverDisconnect) { - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); session_.set_session_id(1234); ConnectionSuccess(&connection); TransferMetadata complete_metadata = @@ -898,7 +899,7 @@ TEST_F(OutgoingShareSessionTest, DelayCompleteMetadataReceiverDisconnect) { } TEST_F(OutgoingShareSessionTest, DelayCompleteMetadataDisconnectTimeout) { - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); session_.set_session_id(1234); std::vector endpoint_info = {1, 2, 3, 4}; std::vector bluetooth_mac_address = {5, 6, 7, 8}; @@ -957,7 +958,7 @@ TEST_F(OutgoingShareSessionTest, UpdateSessionForDedupWithoutCertificate) { TEST_F(OutgoingShareSessionTest, UpdateSessionForDedupConnectedIsNoOp) { auto share_target_org = session_.share_target(); - NearbyConnectionImpl connection(device_info_, kEndpointId); + NearbyConnectionImpl connection(device_info_); session_.set_session_id(1234); ConnectionSuccess(&connection); ShareTarget share_target2{ diff --git a/sharing/paired_key_verification_runner_test.cc b/sharing/paired_key_verification_runner_test.cc index 54899f7e..1c293832 100644 --- a/sharing/paired_key_verification_runner_test.cc +++ b/sharing/paired_key_verification_runner_test.cc @@ -187,7 +187,7 @@ class PairedKeyVerificationRunnerTest : public testing::Test { }; PairedKeyVerificationRunnerTest() - : connection_(fake_device_info_, "test_enpoint_id"), + : connection_(fake_device_info_), frames_reader_(fake_task_runner_, &connection_) { fake_connections_manager_.set_send_payload_callback( [this](std::unique_ptr payload, diff --git a/sharing/share_session_test.cc b/sharing/share_session_test.cc index 819b1b2b..4c892144 100644 --- a/sharing/share_session_test.cc +++ b/sharing/share_session_test.cc @@ -153,7 +153,7 @@ TEST(ShareSessionTest, SetDisconnectStatus) { TEST(ShareSessionTest, OnConnectedSucceeds) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); EXPECT_EQ(session.connection(), &connection); @@ -166,7 +166,7 @@ TEST(ShareSessionTest, IncomingRunPairedKeyVerificationSuccess) { share_target.is_incoming = true; TestShareSession session(std::string(kEndpointId), share_target); session.connections_manager().SetRawAuthenticationToken(kEndpointId, token); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); std::queue> frames_data; session.connections_manager().set_send_payload_callback( @@ -259,7 +259,7 @@ TEST(ShareSessionTest, OnDisconnect) { TEST(ShareSessionTest, CancelPayloads) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); session.SetAttachmentPayloadId(1, 2); session.SetAttachmentPayloadId(3, 4); @@ -273,7 +273,7 @@ TEST(ShareSessionTest, CancelPayloads) { TEST(ShareSessionTest, WriteResponseFrame) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); std::queue> frames_data; session.connections_manager().set_send_payload_callback( @@ -297,7 +297,7 @@ TEST(ShareSessionTest, WriteResponseFrame) { TEST(ShareSessionTest, WriteCancelFrame) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); std::queue> frames_data; session.connections_manager().set_send_payload_callback( @@ -319,7 +319,7 @@ TEST(ShareSessionTest, WriteCancelFrame) { TEST(ShareSessionTest, HandleKeyVerificationResultFail) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); session.SetTokenForTests("9876"); @@ -334,7 +334,7 @@ TEST(ShareSessionTest, HandleKeyVerificationResultSelfShareSuccess) { ShareTarget share_target; share_target.for_self_share = true; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); session.SetTokenForTests("9876"); @@ -349,7 +349,7 @@ TEST(ShareSessionTest, HandleKeyVerificationResultSelfShareSuccess) { TEST(ShareSessionTest, HandleKeyVerificationResultNotSelfShareSuccess) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); session.SetTokenForTests("9876"); @@ -366,7 +366,7 @@ TEST(ShareSessionTest, HandleKeyVerificationResultSelfShareUnable) { ShareTarget share_target; share_target.for_self_share = true; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); session.SetTokenForTests("9876"); @@ -381,7 +381,7 @@ TEST(ShareSessionTest, HandleKeyVerificationResultSelfShareUnable) { TEST(ShareSessionTest, HandleKeyVerificationResultNotSelfShareUnable) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); session.SetTokenForTests("9876"); @@ -396,7 +396,7 @@ TEST(ShareSessionTest, HandleKeyVerificationResultNotSelfShareUnable) { TEST(ShareSessionTest, HandleKeyVerificationResultUnknown) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); session.SetTokenForTests("9876"); @@ -420,7 +420,7 @@ TEST(ShareSessionTest, AbortNotConnected) { TEST(ShareSessionTest, AbortConnected) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); EXPECT_TRUE(session.connections_manager() .connection_endpoint_info(kEndpointId) @@ -440,7 +440,7 @@ TEST(ShareSessionTest, AbortConnected) { TEST(ShareSessionTest, Disconnect) { ShareTarget share_target; TestShareSession session(std::string(kEndpointId), share_target); - NearbyConnectionImpl connection(session.device_info(), kEndpointId); + NearbyConnectionImpl connection(session.device_info()); session.SetNearbyConnection(&connection); EXPECT_TRUE(session.connections_manager() .connection_endpoint_info(kEndpointId)