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

chrome/browser/devtools/device/cast_device_provider_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/devtools/device/cast_device_provider.h"
 
 #include "chrome/browser/devtools/device/android_device_manager.h"
 #include "net/base/host_port_pair.h"
+#include "net/base/ip_address.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 typedef AndroidDeviceManager::DeviceInfo DeviceInfo;
 typedef AndroidDeviceManager::BrowserInfo BrowserInfo;
 
 void CompareDeviceInfo(bool* was_run,
                        const DeviceInfo& expected,
                        const DeviceInfo& actual) {
@@ skipping 23 matching lines @@
   const std::string cast_service_type = "_googlecast._tcp.local";
   const std::string cast_service_model = "Fake Cast Device";
 
   ServiceDescription cast_service;
   cast_service.service_name =
       cast_service_display_name + "." + cast_service_type;
   cast_service.address = net::HostPortPair("192.168.1.101", 8009);
   cast_service.metadata.push_back("id=0123456789abcdef0123456789abcdef");
   cast_service.metadata.push_back("ve=00");
   cast_service.metadata.push_back("md=" + cast_service_model);
-  cast_service.ip_address = {192, 168, 1, 101};
+  uint8_t address1[4] = {192, 168, 1, 101};
+  cast_service.ip_address = net::IPAddress(address1, sizeof(address1));

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

Or alternately:

ASSERT_TRUE(net::IPAddress::FromIPLiteral("192.168.1.101",
&cast_service.ip_address));

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

Done.

 
   device_provider_->OnDeviceChanged(true, cast_service);
 
   BrowserInfo exp_browser_info;
   exp_browser_info.socket_name = "9222";
   exp_browser_info.display_name = cast_service_display_name;
   exp_browser_info.type = BrowserInfo::kTypeChrome;
 
   DeviceInfo expected;
   expected.model = cast_service_model;  // From metadata::md
@@ skipping 13 matching lines @@
   const std::string other_service_type = "_other._tcp.local";
   const std::string other_service_model = "Some Other Device";
 
   ServiceDescription other_service;
   other_service.service_name =
       other_service_display_name + "." + other_service_type;
   other_service.address = net::HostPortPair("10.64.1.101", 1234);
   other_service.metadata.push_back("id=0123456789abcdef0123456789abcdef");
   other_service.metadata.push_back("ve=00");
   other_service.metadata.push_back("md=" + other_service_model);
-  other_service.ip_address = {10, 64, 1, 101};
+  uint8_t address2[4] = {10, 64, 1, 101};
+  other_service.ip_address = net::IPAddress(address2, sizeof(address2));
 
   // Callback should not be run, since this service is not yet discovered.
   device_provider_->QueryDeviceInfo(other_service.address.host(),
                                     base::Bind(&DummyCallback, &was_run));
   ASSERT_FALSE(was_run);
 
   device_provider_->OnDeviceChanged(true, other_service);
 
   // Callback should not be run, since non-cast services are not discovered by
   // this device provider.
   device_provider_->QueryDeviceInfo(other_service.address.host(),
                                     base::Bind(&DummyCallback, &was_run));
   ASSERT_FALSE(was_run);
 
   // Remove the cast service.
   device_provider_->OnDeviceRemoved(cast_service.service_name);
 
   // Callback should not be run, since the cast service has been removed.
   device_provider_->QueryDeviceInfo(cast_service.address.host(),
                                     base::Bind(&DummyCallback, &was_run));
   ASSERT_FALSE(was_run);
 }