diff options
author | btolsch <btolsch@chromium.org> | 2020-04-15 23:26:36 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-04-16 19:09:57 +0000 |
commit | c117a70b3913598e3dfe37b2668a64c0eb5634c7 (patch) | |
tree | 305b08de18d1c48743b478b04481a8e4464a4cf6 /cast/sender | |
parent | f4308e08dc82019521f565bbd201233139c6c7f0 (diff) | |
download | openscreen-c117a70b3913598e3dfe37b2668a64c0eb5634c7.tar.gz |
Rename CastSocket::SendMessage to Send
This change renames both CastSocket::SendMessage and the wrapper
VirtualConnectionRouter::SendMessage to Send. On Windows, translation
units compiled with windows.h will accidentally rename this to
SendMessageA or SendMessageW due Microsoft's macro-ing. This means that
libcast code compiled without windows.h won't link with anything
compiled with windows.h.
Bug: 1050913
Change-Id: I24faa8895a921c4a17a7dafc442a0cbcc980de8e
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2152217
Reviewed-by: Ryan Keane <rwkeane@google.com>
Commit-Queue: Brandon Tolsch <btolsch@chromium.org>
Diffstat (limited to 'cast/sender')
-rw-r--r-- | cast/sender/cast_app_discovery_service_impl_unittest.cc | 14 | ||||
-rw-r--r-- | cast/sender/cast_platform_client.cc | 4 | ||||
-rw-r--r-- | cast/sender/cast_platform_client_unittest.cc | 6 | ||||
-rw-r--r-- | cast/sender/channel/sender_socket_factory.cc | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/cast/sender/cast_app_discovery_service_impl_unittest.cc b/cast/sender/cast_app_discovery_service_impl_unittest.cc index 863eb347..008b1a74 100644 --- a/cast/sender/cast_app_discovery_service_impl_unittest.cc +++ b/cast/sender/cast_app_discovery_service_impl_unittest.cc @@ -108,7 +108,7 @@ TEST_F(CastAppDiscoveryServiceImplTest, StartObservingAvailability) { CastMessage availability_response = CreateAppAvailableResponseChecked(request_id, sender_id, "AAA"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); ASSERT_EQ(receivers1.size(), 1u); ASSERT_EQ(receivers2.size(), 1u); EXPECT_EQ(receivers1[0].unique_id, "deviceId1"); @@ -131,7 +131,7 @@ TEST_F(CastAppDiscoveryServiceImplTest, ReAddAvailQueryUsesCachedValue) { CastMessage availability_response = CreateAppAvailableResponseChecked(request_id, sender_id, "AAA"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); ASSERT_EQ(receivers1.size(), 1u); EXPECT_EQ(receivers1[0].unique_id, "deviceId1"); @@ -154,7 +154,7 @@ TEST_F(CastAppDiscoveryServiceImplTest, AvailQueryUpdatedOnReceiverUpdate) { // Result set now includes |receiver_|. CastMessage availability_response = CreateAppAvailableResponseChecked(request_id, sender_id, "AAA"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); ASSERT_EQ(receivers1.size(), 1u); EXPECT_EQ(receivers1[0].unique_id, "deviceId1"); @@ -202,10 +202,10 @@ TEST_F(CastAppDiscoveryServiceImplTest, Refresh) { CastMessage availability_response = CreateAppAvailableResponseChecked(request_idA, sender_id, "AAA"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); availability_response = CreateAppUnavailableResponseChecked(request_idB, sender_id, "BBB"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); ASSERT_EQ(receivers1.size(), 1u); ASSERT_EQ(receivers2.size(), 0u); EXPECT_EQ(receivers1[0].unique_id, "deviceId1"); @@ -291,7 +291,7 @@ TEST_F(CastAppDiscoveryServiceImplTest, StartObservingAvailabilityCachedValue) { CastMessage availability_response = CreateAppAvailableResponseChecked(request_id, sender_id, "AAA"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); ASSERT_EQ(receivers1.size(), 1u); EXPECT_EQ(receivers1[0].unique_id, "deviceId1"); @@ -326,7 +326,7 @@ TEST_F(CastAppDiscoveryServiceImplTest, AvailabilityUnknownOrUnavailable) { CastMessage availability_response = CreateAppUnavailableResponseChecked(request_id, sender_id, "AAA"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); // Known availability so no request sent. EXPECT_CALL(peer_client(), OnMessage(_, _)).Times(0); diff --git a/cast/sender/cast_platform_client.cc b/cast/sender/cast_platform_client.cc index 6e3d13da..7f7dde66 100644 --- a/cast/sender/cast_platform_client.cc +++ b/cast/sender/cast_platform_client.cc @@ -87,8 +87,8 @@ absl::optional<int> CastPlatformClient::RequestAppAvailability( VirtualConnection::AssociatedData{}); } - virtual_conn_router_->SendMessage(std::move(virtual_conn), - std::move(message.value())); + virtual_conn_router_->Send(std::move(virtual_conn), + std::move(message.value())); return request_id; } diff --git a/cast/sender/cast_platform_client_unittest.cc b/cast/sender/cast_platform_client_unittest.cc index 44e99660..eaaf5c6e 100644 --- a/cast/sender/cast_platform_client_unittest.cc +++ b/cast/sender/cast_platform_client_unittest.cc @@ -74,12 +74,12 @@ TEST_F(CastPlatformClientTest, AppAvailability) { CastMessage availability_response = CreateAppAvailableResponseChecked(request_id, sender_id, "AAA"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); EXPECT_TRUE(ran); // NOTE: Callback should only fire once, so it should not fire again here. ran = false; - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); EXPECT_FALSE(ran); } @@ -103,7 +103,7 @@ TEST_F(CastPlatformClientTest, CancelRequest) { CastMessage availability_response = CreateAppAvailableResponseChecked(request_id, sender_id, "AAA"); - EXPECT_TRUE(peer_socket().SendMessage(availability_response).ok()); + EXPECT_TRUE(peer_socket().Send(availability_response).ok()); } } // namespace cast diff --git a/cast/sender/channel/sender_socket_factory.cc b/cast/sender/channel/sender_socket_factory.cc index bf89de88..84826bdc 100644 --- a/cast/sender/channel/sender_socket_factory.cc +++ b/cast/sender/channel/sender_socket_factory.cc @@ -92,7 +92,7 @@ void SenderSocketFactory::OnConnected( PendingAuth& pending = *pending_auth_.back(); CastMessage auth_challenge = CreateAuthChallengeMessage(pending.auth_context); - Error error = pending.socket->SendMessage(auth_challenge); + Error error = pending.socket->Send(auth_challenge); if (!error.ok()) { pending_auth_.pop_back(); client_->OnError(this, endpoint, error); |