Migrate Local Discovery from net::IPAddressNumber to net::IPAddress.

chrome/common/local_discovery/service_discovery_client_unittest.cc

Index: chrome/common/local_discovery/service_discovery_client_unittest.cc
diff --git a/chrome/common/local_discovery/service_discovery_client_unittest.cc b/chrome/common/local_discovery/service_discovery_client_unittest.cc
index 0b77410372fa9b51046e891082da129ad99fe2c3..af6b8c256c0a4927f90f29dc01554977b50981fa 100644
--- a/chrome/common/local_discovery/service_discovery_client_unittest.cc
+++ b/chrome/common/local_discovery/service_discovery_client_unittest.cc
@@ -410,10 +410,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);
+    uint8_t address[4] = {1, 2, 3, 4};
+    ip_address_expected_ = net::IPAddress(address, sizeof(address));

[eroman, 2015/12/21 20:47:33]

This pattern is common enough, that you might want o create a constructor that
takes an array (and infers the length using template)

[martijnc, 2016/01/27 22:50:52]

Replaced with IPAddress::FromIPLiteral().

   }
 
   ~ServiceResolverTest() {
@@ -438,14 +436,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) {
@@ -457,11 +455,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));
 };