Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3005)

Unified Diff: chrome/browser/local_discovery/service_discovery_client_unittest.cc

Issue 1534583002: Migrate Local Discovery from net::IPAddressNumber to net::IPAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix builders Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/local_discovery/service_discovery_client_unittest.cc
diff --git a/chrome/browser/local_discovery/service_discovery_client_unittest.cc b/chrome/browser/local_discovery/service_discovery_client_unittest.cc
index 9292356417b2ecf042ec724ff946be67016c5b64..447dfb4588e1089055dd832e585200f27f6d850a 100644
--- a/chrome/browser/local_discovery/service_discovery_client_unittest.cc
+++ b/chrome/browser/local_discovery/service_discovery_client_unittest.cc
@@ -412,10 +412,8 @@ class ServiceResolverTest : public ServiceDiscoveryTest {
ServiceResolverTest() {
metadata_expected_.push_back("hello");
address_expected_ = net::HostPortPair("myhello.local", 8888);
- ip_address_expected_.push_back(1);
- ip_address_expected_.push_back(2);
- ip_address_expected_.push_back(3);
- ip_address_expected_.push_back(4);
+ EXPECT_TRUE(
+ net::IPAddress::FromIPLiteral("1.2.3.4", &ip_address_expected_));
}
~ServiceResolverTest() {
@@ -440,14 +438,14 @@ class ServiceResolverTest : public ServiceDiscoveryTest {
void(ServiceResolver::RequestStatus,
const std::string&,
const std::vector<std::string>&,
- const net::IPAddressNumber&));
+ const net::IPAddress&));
protected:
scoped_ptr<ServiceResolver> resolver_;
- net::IPAddressNumber ip_address_;
+ net::IPAddress ip_address_;
net::HostPortPair address_expected_;
std::vector<std::string> metadata_expected_;
- net::IPAddressNumber ip_address_expected_;
+ net::IPAddress ip_address_expected_;
};
TEST_F(ServiceResolverTest, TxtAndSrvButNoA) {
@@ -459,11 +457,10 @@ TEST_F(ServiceResolverTest, TxtAndSrvButNoA) {
base::MessageLoop::current()->RunUntilIdle();
- EXPECT_CALL(*this,
- OnFinishedResolvingInternal(ServiceResolver::STATUS_SUCCESS,
- address_expected_.ToString(),
- metadata_expected_,
- net::IPAddressNumber()));
+ EXPECT_CALL(
+ *this, OnFinishedResolvingInternal(ServiceResolver::STATUS_SUCCESS,
+ address_expected_.ToString(),
+ metadata_expected_, net::IPAddress()));
socket_factory_.SimulateReceive(kSamplePacketTXT, sizeof(kSamplePacketTXT));
}

Powered by Google App Engine
This is Rietveld 408576698