commit a2e83bd7ccf333483d7ac0f7bcc1f36191af1a6d
author martijn <martijn@martijnc.be> Fri Mar 18 13:10:45 2016
committer Commit bot <commit-bot@chromium.org> Fri Mar 18 13:11:47 2016
tree 989904f7cb203c22ac9a4cd81b332ef761cb8aa8
parent dc1557a2f96a9a8d85eec584ae22176352aee13d

Migrate net/socket/* to net::IPAddress.

BUG=496258

Review URL: https://codereview.chromium.org/1801353004

Cr-Commit-Position: refs/heads/master@{#381946}

net/socket/tcp_socket_unittest.cc

diff --git a/net/socket/tcp_socket_unittest.cc b/net/socket/tcp_socket_unittest.cc
index ade3ee7fd..15f9355 100644
--- a/net/socket/tcp_socket_unittest.cc
+++ b/net/socket/tcp_socket_unittest.cc
@@ -14,6 +14,7 @@
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
+#include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/sockaddr_storage.h"
 #include "net/base/test_completion_callback.h"
@@ -32,22 +33,17 @@
   }
 
   void SetUpListenIPv4() {
-    IPEndPoint address;
-    ParseAddress("127.0.0.1", 0, &address);
-
     ASSERT_EQ(OK, socket_.Open(ADDRESS_FAMILY_IPV4));
-    ASSERT_EQ(OK, socket_.Bind(address));
+    ASSERT_EQ(OK, socket_.Bind(IPEndPoint(IPAddress::IPv4Localhost(), 0)));
     ASSERT_EQ(OK, socket_.Listen(kListenBacklog));
     ASSERT_EQ(OK, socket_.GetLocalAddress(&local_address_));
   }
 
   void SetUpListenIPv6(bool* success) {
     *success = false;
-    IPEndPoint address;
-    ParseAddress("::1", 0, &address);
 
     if (socket_.Open(ADDRESS_FAMILY_IPV6) != OK ||
-        socket_.Bind(address) != OK ||
+        socket_.Bind(IPEndPoint(IPAddress::IPv6Localhost(), 0)) != OK ||
         socket_.Listen(kListenBacklog) != OK) {
       LOG(ERROR) << "Failed to listen on ::1 - probably because IPv6 is "
           "disabled. Skipping the test";
@@ -57,16 +53,6 @@
     *success = true;
   }
 
-  void ParseAddress(const std::string& ip_str,
-                    uint16_t port,
-                    IPEndPoint* address) {
-    IPAddressNumber ip_number;
-    bool rv = ParseIPLiteralToNumber(ip_str, &ip_number);
-    if (!rv)
-      return;
-    *address = IPEndPoint(ip_number, port);
-  }
-
   void TestAcceptAsync() {
     TestCompletionCallback accept_callback;
     scoped_ptr<TCPSocket> accepted_socket;
@@ -138,8 +124,7 @@
   SOCKET existing_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
   ASSERT_EQ(OK, socket_.AdoptListenSocket(existing_socket));
 
-  IPEndPoint address;
-  ParseAddress("127.0.0.1", 0, &address);
+  IPEndPoint address(IPAddress::IPv4Localhost(), 0);
   SockaddrStorage storage;
   ASSERT_TRUE(address.ToSockAddr(storage.addr, &storage.addr_len));
   ASSERT_EQ(0, bind(existing_socket, storage.addr, storage.addr_len));