Explicit comparisons on NetworkRoute.
Since not all fields are compared on NetworkRoute structs, the ==
operator overload doesn't really make the code easier to read. In fact
the feature that it only compares a subset of the fields is only used
once, at the other places, all fields are compared.
Removing the overload makes it more clear what is compared at each call
site.
Bug: webrtc:9883
Change-Id: I74f7eb32b602aa33fd282a815b71a172ae3f6a8b
Reviewed-on: https://webrtc-review.googlesource.com/c/113001
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25891}diff --git a/pc/channel_unittest.cc b/pc/channel_unittest.cc
index a6e783f..07e9e18 100644
--- a/pc/channel_unittest.cc
+++ b/pc/channel_unittest.cc
@@ -925,12 +925,11 @@
});
WaitForThreads();
EXPECT_EQ(1, media_channel1->num_network_route_changes());
- rtc::NetworkRoute expected_network_route;
- expected_network_route.connected = true;
- expected_network_route.local_network_id = kLocalNetId;
- expected_network_route.remote_network_id = kRemoteNetId;
- expected_network_route.last_sent_packet_id = kLastPacketId;
- EXPECT_EQ(expected_network_route, media_channel1->last_network_route());
+ EXPECT_TRUE(media_channel1->last_network_route().connected);
+ EXPECT_EQ(kLocalNetId,
+ media_channel1->last_network_route().local_network_id);
+ EXPECT_EQ(kRemoteNetId,
+ media_channel1->last_network_route().remote_network_id);
EXPECT_EQ(kLastPacketId,
media_channel1->last_network_route().last_sent_packet_id);
EXPECT_EQ(kTransportOverheadPerPacket + kSrtpOverheadPerPacket,