Migrate content/*/p2p/* code to net::IPAddress.

content/renderer/p2p/ipc_network_manager_unittest.cc

 // Copyright 2014 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 "base/memory/scoped_ptr.h"
 #include "content/renderer/p2p/ipc_network_manager.h"
 #include "content/renderer/p2p/network_list_manager.h"
-#include "net/base/ip_address_number.h"
+#include "net/base/ip_address.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_interfaces.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 class MockP2PSocketDispatcher : public NetworkListManager {
  public:
@@ skipping 27 matching lines @@
 };
 
 // Test overall logic of IpcNetworkManager on OnNetworkListChanged
 // that it should group addresses with the same network key under
 // single Network class. This also tests the logic inside
 // IpcNetworkManager in addition to MergeNetworkList.
 // TODO(guoweis): disable this test case for now until fix for webrtc
 // issue 19249005 integrated into chromium
 TEST_F(IpcNetworkManagerTest, TestMergeNetworkList) {
   net::NetworkInterfaceList list;
-  net::IPAddressNumber ip_number;
+  net::IPAddress ip;
   std::vector<rtc::Network*> networks;
   rtc::IPAddress ip_address;
 
   // Add 2 networks with the same prefix and prefix length.
-  EXPECT_TRUE(net::ParseIPLiteralToNumber(kIPv6PublicAddrString1, &ip_number));
-  list.push_back(
-      net::NetworkInterface("em1",
-                            "em1",
-                            0,
-                            net::NetworkChangeNotifier::CONNECTION_UNKNOWN,
-                            ip_number,
-                            64,
-                            net::IP_ADDRESS_ATTRIBUTE_NONE));
+  EXPECT_TRUE(ip.AssignFromIPLiteral(kIPv6PublicAddrString1));
+  list.push_back(net::NetworkInterface(
+      "em1", "em1", 0, net::NetworkChangeNotifier::CONNECTION_UNKNOWN, ip, 64,
+      net::IP_ADDRESS_ATTRIBUTE_NONE));
 
-  EXPECT_TRUE(net::ParseIPLiteralToNumber(kIPv6PublicAddrString2, &ip_number));
-  list.push_back(
-      net::NetworkInterface("em1",
-                            "em1",
-                            0,
-                            net::NetworkChangeNotifier::CONNECTION_UNKNOWN,
-                            ip_number,
-                            64,
-                            net::IP_ADDRESS_ATTRIBUTE_NONE));
+  EXPECT_TRUE(ip.AssignFromIPLiteral(kIPv6PublicAddrString2));
+  list.push_back(net::NetworkInterface(
+      "em1", "em1", 0, net::NetworkChangeNotifier::CONNECTION_UNKNOWN, ip, 64,
+      net::IP_ADDRESS_ATTRIBUTE_NONE));
 
-  network_manager_->OnNetworkListChanged(list, net::IPAddressNumber(),
-                                         net::IPAddressNumber());
+  network_manager_->OnNetworkListChanged(list, net::IPAddress(),
+                                         net::IPAddress());
   network_manager_->GetNetworks(&networks);
   EXPECT_EQ(1uL, networks.size());
   EXPECT_EQ(2uL, networks[0]->GetIPs().size());
 
   // Add another network with different prefix length, should result in
   // a different network.
   networks.clear();
-  list.push_back(
-      net::NetworkInterface("em1",
-                            "em1",
-                            0,
-                            net::NetworkChangeNotifier::CONNECTION_UNKNOWN,
-                            ip_number,
-                            48,
-                            net::IP_ADDRESS_ATTRIBUTE_NONE));
+  list.push_back(net::NetworkInterface(
+      "em1", "em1", 0, net::NetworkChangeNotifier::CONNECTION_UNKNOWN, ip, 48,
+      net::IP_ADDRESS_ATTRIBUTE_NONE));
 
   // Push an unknown address as the default address.
-  EXPECT_TRUE(net::ParseIPLiteralToNumber(kIPv4MappedAddrString, &ip_number));
-  network_manager_->OnNetworkListChanged(list, net::IPAddressNumber(),
-                                         ip_number);
+  EXPECT_TRUE(ip.AssignFromIPLiteral(kIPv4MappedAddrString));
+  network_manager_->OnNetworkListChanged(list, net::IPAddress(), ip);
 
   // The unknown default address should be ignored.
   EXPECT_FALSE(network_manager_->GetDefaultLocalAddress(AF_INET6, &ip_address));
 
   network_manager_->GetNetworks(&networks);
 
   // Verify we have 2 networks now.
   EXPECT_EQ(2uL, networks.size());
   // Verify the network with prefix length of 64 has 2 IP addresses.
   EXPECT_EQ(64, networks[1]->prefix_length());
   EXPECT_EQ(2uL, networks[1]->GetIPs().size());
   EXPECT_TRUE(rtc::IPFromString(kIPv6PublicAddrString1, &ip_address));
   EXPECT_EQ(networks[1]->GetIPs()[0], ip_address);
   EXPECT_TRUE(rtc::IPFromString(kIPv6PublicAddrString2, &ip_address));
   EXPECT_EQ(networks[1]->GetIPs()[1], ip_address);
   // Verify the network with prefix length of 48 has 2 IP addresses.
   EXPECT_EQ(48, networks[0]->prefix_length());
   EXPECT_EQ(1uL, networks[0]->GetIPs().size());
   EXPECT_TRUE(rtc::IPFromString(kIPv6PublicAddrString2, &ip_address));
   EXPECT_EQ(networks[0]->GetIPs()[0], ip_address);
 }
 
 }  // namespace content