Change IPEndpoint::address() to return a net::IPAddress

net/http/http_network_transaction_unittest.cc

 // Copyright 2013 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 "net/http/http_network_transaction.h"
 
 #include <math.h>  // ceil
 #include <stdarg.h>
 #include <stdint.h>
 #include <limits>
@@ skipping 379 matching lines @@
       return out;
     }
     out.status_line = response->headers->GetStatusLine();
 
     EXPECT_EQ("127.0.0.1", response->socket_address.host());
     EXPECT_EQ(80, response->socket_address.port());
 
     bool got_endpoint =
         trans->GetRemoteEndpoint(&out.remote_endpoint_after_start);
     EXPECT_EQ(got_endpoint,
-              out.remote_endpoint_after_start.address().size() > 0);
+              out.remote_endpoint_after_start.address_number().size() > 0);
 
     rv = ReadTransaction(trans.get(), &out.response_data);
     EXPECT_EQ(OK, rv);
 
     TestNetLogEntry::List entries;
     log.GetEntries(&entries);
     size_t pos = ExpectLogContainsSomewhere(
         entries, 0, NetLog::TYPE_HTTP_TRANSACTION_SEND_REQUEST_HEADERS,
         NetLog::PHASE_NONE);
     ExpectLogContainsSomewhere(
@@ skipping 308 matching lines @@
   };
   SimpleGetHelperResult out = SimpleGetHelper(data_reads,
                                               arraysize(data_reads));
   EXPECT_EQ(OK, out.rv);
   EXPECT_EQ("HTTP/1.0 200 OK", out.status_line);
   EXPECT_EQ("hello world", out.response_data);
   int64_t reads_size = CountReadBytes(data_reads, arraysize(data_reads));
   EXPECT_EQ(reads_size, out.total_received_bytes);
   EXPECT_EQ(0u, out.connection_attempts.size());
 
-  EXPECT_FALSE(out.remote_endpoint_after_start.address().empty());
+  EXPECT_FALSE(out.remote_endpoint_after_start.address_number().empty());
 }
 
 // Response with no status line.
 TEST_P(HttpNetworkTransactionTest, SimpleGETNoHeaders) {
   MockRead data_reads[] = {
     MockRead("hello world"),
     MockRead(SYNCHRONOUS, OK),
   };
   SimpleGetHelperResult out = SimpleGetHelper(data_reads,
                                               arraysize(data_reads));
@@ skipping 898 matching lines @@
   TestCompletionCallback callback;
 
   int rv = trans->Start(&request, callback.callback(), BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
   EXPECT_EQ(ERR_CONNECTION_RESET, rv);
 
   IPEndPoint endpoint;
   EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
-  EXPECT_LT(0u, endpoint.address().size());
+  EXPECT_LT(0u, endpoint.address_number().size());
 }
 
 // What do various browsers do when the server closes a non-keepalive
 // connection without sending any response header or body?
 //
 // IE7: error page
 // Safari 3.1.2 (Windows): error page
 // Firefox 3.0.1: blank page
 // Opera 9.52: after five attempts, blank page
 // Us with WinHTTP: error page (ERR_INVALID_RESPONSE)
@@ skipping 491 matching lines @@
   EXPECT_EQ(writes_size1, trans->GetTotalSentBytes());
   int64_t reads_size1 = CountReadBytes(data_reads1, arraysize(data_reads1));
   EXPECT_EQ(reads_size1, trans->GetTotalReceivedBytes());
 
   const HttpResponseInfo* response = trans->GetResponseInfo();
   ASSERT_TRUE(response);
   EXPECT_TRUE(CheckBasicServerAuth(response->auth_challenge.get()));
 
   IPEndPoint endpoint;
   EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
-  ASSERT_FALSE(endpoint.address().empty());
+  ASSERT_FALSE(endpoint.address_number().empty());
   EXPECT_EQ("127.0.0.1:80", endpoint.ToString());
 
   resolver->rules()->ClearRules();
   resolver->rules()->AddRule("www.example.org", "127.0.0.2");
 
   TestCompletionCallback callback2;
 
   EXPECT_EQ(OK, callback2.GetResult(trans->RestartWithAuth(
                     AuthCredentials(kFoo, kBar), callback2.callback())));
 
@@ skipping 10 matching lines @@
   EXPECT_EQ(writes_size1 + writes_size2, trans->GetTotalSentBytes());
   int64_t reads_size2 = CountReadBytes(data_reads2, arraysize(data_reads2));
   EXPECT_EQ(reads_size1 + reads_size2, trans->GetTotalReceivedBytes());
 
   response = trans->GetResponseInfo();
   ASSERT_TRUE(response);
   EXPECT_FALSE(response->auth_challenge.get());
   EXPECT_EQ(100, response->headers->GetContentLength());
 
   EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
-  ASSERT_FALSE(endpoint.address().empty());
+  ASSERT_FALSE(endpoint.address_number().empty());
   EXPECT_EQ("127.0.0.2:80", endpoint.ToString());
 }
 
 TEST_P(HttpNetworkTransactionTest, DoNotSendAuth) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.example.org/");
   request.load_flags = LOAD_DO_NOT_SEND_AUTH_DATA;
 
   scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ skipping 6852 matching lines @@
       new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
 
   int rv = trans->Start(&request, callback.callback(), BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
   EXPECT_EQ(ERR_CONNECTION_RESET, rv);
 
   IPEndPoint endpoint;
   EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
-  EXPECT_LT(0u, endpoint.address().size());
+  EXPECT_LT(0u, endpoint.address_number().size());
 }
 
 // Check that a connection closed after the start of the headers finishes ok.
 TEST_P(HttpNetworkTransactionTest, ConnectionClosedAfterStartOfHeaders) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.foo.com/");
   request.load_flags = 0;
 
   MockRead data_reads[] = {
@@ skipping 22 matching lines @@
   EXPECT_TRUE(response->headers.get() != NULL);
   EXPECT_EQ("HTTP/1.0 200 OK", response->headers->GetStatusLine());
 
   std::string response_data;
   rv = ReadTransaction(trans.get(), &response_data);
   EXPECT_EQ(OK, rv);
   EXPECT_EQ("", response_data);
 
   IPEndPoint endpoint;
   EXPECT_TRUE(trans->GetRemoteEndpoint(&endpoint));
-  EXPECT_LT(0u, endpoint.address().size());
+  EXPECT_LT(0u, endpoint.address_number().size());
 }
 
 // Make sure that a dropped connection while draining the body for auth
 // restart does the right thing.
 TEST_P(HttpNetworkTransactionTest, DrainResetOK) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.example.org/");
   request.load_flags = 0;
 
@@ skipping 4986 matching lines @@
   HttpRequestHeaders request_headers;
   trans->GetFullRequestHeaders(&request_headers);
 
   ConnectionAttempts attempts;
   trans->GetConnectionAttempts(&attempts);
   ASSERT_EQ(1u, attempts.size());
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, attempts[0].result);
 
   IPEndPoint endpoint;
   EXPECT_FALSE(trans->GetRemoteEndpoint(&endpoint));
-  EXPECT_TRUE(endpoint.address().empty());
+  EXPECT_TRUE(endpoint.address_number().empty());
 }
 
 TEST_P(HttpNetworkTransactionTest, HttpAsyncConnectError) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.example.org/");
   request.load_flags = 0;
 
   scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
   scoped_ptr<HttpTransaction> trans(
@@ skipping 16 matching lines @@
   HttpRequestHeaders request_headers;
   trans->GetFullRequestHeaders(&request_headers);
 
   ConnectionAttempts attempts;
   trans->GetConnectionAttempts(&attempts);
   ASSERT_EQ(1u, attempts.size());
   EXPECT_EQ(ERR_NAME_NOT_RESOLVED, attempts[0].result);
 
   IPEndPoint endpoint;
   EXPECT_FALSE(trans->GetRemoteEndpoint(&endpoint));
-  EXPECT_TRUE(endpoint.address().empty());
+  EXPECT_TRUE(endpoint.address_number().empty());
 }
 
 TEST_P(HttpNetworkTransactionTest, HttpSyncWriteError) {
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.example.org/");
   request.load_flags = 0;
 
   scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
   scoped_ptr<HttpTransaction> trans(
@@ skipping 1634 matching lines @@
 
   scoped_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
   HttpNetworkTransaction trans(DEFAULT_PRIORITY, session.get());
 
   EXPECT_THAT(trans.server_ssl_config_.alpn_protos,
               testing::ElementsAre(kProtoHTTP2, kProtoSPDY31, kProtoHTTP11));
   EXPECT_TRUE(trans.server_ssl_config_.npn_protos.empty());
 }
 
 }  // namespace net