Net: Get rid of ProxyServer::host_and_port() and friends.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3032017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53403 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 23 insertions, 33 deletions

diff --git a/net/http/http_alternate_protocols.cc b/net/http/http_alternate_protocols.cc
index cd42ed5..c3804ac4 100644
--- a/net/http/http_alternate_protocols.cc
+++ b/net/http/http_alternate_protocols.cc
@@ -24,9 +24,7 @@ bool HttpAlternateProtocols::HasAlternateProtocolFor(
 
 bool HttpAlternateProtocols::HasAlternateProtocolFor(
     const std::string& host, uint16 port) const {
-  struct HostPortPair http_host_port_pair;
-  http_host_port_pair.host = host;
-  http_host_port_pair.port = port;
+  HostPortPair http_host_port_pair(host, port);
   return HasAlternateProtocolFor(http_host_port_pair);
 }
 
@@ -40,9 +38,7 @@ HttpAlternateProtocols::GetAlternateProtocolFor(
 HttpAlternateProtocols::PortProtocolPair
 HttpAlternateProtocols::GetAlternateProtocolFor(
     const std::string& host, uint16 port) const {
-  struct HostPortPair http_host_port_pair;
-  http_host_port_pair.host = host;
-  http_host_port_pair.port = port;
+  HostPortPair http_host_port_pair(host, port);
   return GetAlternateProtocolFor(http_host_port_pair);
 }
 
diff --git a/net/http/http_alternate_protocols.h b/net/http/http_alternate_protocols.h
index 56fb49a..0c16798 100644
--- a/net/http/http_alternate_protocols.h
+++ b/net/http/http_alternate_protocols.h
@@ -10,7 +10,9 @@
 #define NET_HTTP_HTTP_ALTERNATE_PROTOCOLS_H_
 
 #include <map>
+#include <string>
 #include <utility>
+
 #include "base/basictypes.h"
 #include "net/base/host_port_pair.h"
 
diff --git a/net/http/http_alternate_protocols_unittest.cc b/net/http/http_alternate_protocols_unittest.cc
index d82f850..0cf6f9a 100644
--- a/net/http/http_alternate_protocols_unittest.cc
+++ b/net/http/http_alternate_protocols_unittest.cc
@@ -14,9 +14,7 @@ namespace {
 
 TEST(HttpAlternateProtocols, Basic) {
   HttpAlternateProtocols alternate_protocols;
-  HostPortPair test_host_port_pair;
-  test_host_port_pair.host = "foo";
-  test_host_port_pair.port = 80;
+  HostPortPair test_host_port_pair("foo", 80);
   EXPECT_FALSE(
       alternate_protocols.HasAlternateProtocolFor(test_host_port_pair));
   alternate_protocols.SetAlternateProtocolFor(
@@ -30,9 +28,7 @@ TEST(HttpAlternateProtocols, Basic) {
 
 TEST(HttpAlternateProtocols, SetBroken) {
   HttpAlternateProtocols alternate_protocols;
-  HostPortPair test_host_port_pair;
-  test_host_port_pair.host = "foo";
-  test_host_port_pair.port = 80;
+  HostPortPair test_host_port_pair("foo", 80);
   alternate_protocols.MarkBrokenAlternateProtocolFor(test_host_port_pair);
   ASSERT_TRUE(alternate_protocols.HasAlternateProtocolFor(test_host_port_pair));
   HttpAlternateProtocols::PortProtocolPair alternate =
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index a85a1ca..2e5b437 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -4,6 +4,9 @@
 
 #include "net/http/http_network_transaction.h"
 
+#include <set>
+#include <vector>
+
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
 #include "base/format_macros.h"
@@ -133,7 +136,6 @@ void BuildRequestHeaders(const HttpRequestInfo* request_info,
 void ProcessAlternateProtocol(const HttpResponseHeaders& headers,
                               const HostPortPair& http_host_port_pair,
                               HttpAlternateProtocols* alternate_protocols) {
-
   std::string alternate_protocol_str;
   if (!headers.EnumerateHeader(NULL, HttpAlternateProtocols::kHeader,
                                &alternate_protocol_str)) {
@@ -630,11 +632,11 @@ int HttpNetworkTransaction::DoResolveProxy() {
 
   if (g_host_mapping_rules && g_host_mapping_rules->RewriteHost(&endpoint_)) {
     url_canon::Replacements<char> replacements;
-    const std::string port_str = IntToString(endpoint_.port);
+    const std::string port_str = IntToString(endpoint_.port());
     replacements.SetPort(port_str.c_str(),
                          url_parse::Component(0, port_str.size()));
-    replacements.SetHost(endpoint_.host.c_str(),
-                         url_parse::Component(0, endpoint_.host.size()));
+    replacements.SetHost(endpoint_.host().c_str(),
+                         url_parse::Component(0, endpoint_.host().size()));
     alternate_endpoint_url = curr_endpoint_url->ReplaceComponents(replacements);
     curr_endpoint_url = &alternate_endpoint_url;
   }
@@ -648,14 +650,14 @@ int HttpNetworkTransaction::DoResolveProxy() {
           alternate_protocols.GetAlternateProtocolFor(endpoint_);
       if (alternate.protocol != HttpAlternateProtocols::BROKEN) {
         DCHECK_EQ(HttpAlternateProtocols::NPN_SPDY_1, alternate.protocol);
-        endpoint_.port = alternate.port;
+        endpoint_.set_port(alternate.port);
         alternate_protocol_ = HttpAlternateProtocols::NPN_SPDY_1;
         alternate_protocol_mode_ = kUsingAlternateProtocol;
 
         url_canon::Replacements<char> replacements;
         replacements.SetScheme("https",
                                url_parse::Component(0, strlen("https")));
-        const std::string port_str = IntToString(endpoint_.port);
+        const std::string port_str = IntToString(endpoint_.port());
         replacements.SetPort(port_str.c_str(),
                              url_parse::Component(0, port_str.size()));
         alternate_endpoint_url =
@@ -718,9 +720,9 @@ int HttpNetworkTransaction::DoInitConnection() {
   // Use the fixed testing ports if they've been provided.
   if (using_ssl_) {
     if (session_->fixed_https_port() != 0)
-      endpoint_.port = session_->fixed_https_port();
+      endpoint_.set_port(session_->fixed_https_port());
   } else if (session_->fixed_http_port() != 0) {
-    endpoint_.port = session_->fixed_http_port();
+    endpoint_.set_port(session_->fixed_http_port());
   }
 
   // Check first if we have a spdy session for this group.  If so, then go
@@ -757,8 +759,7 @@ int HttpNetworkTransaction::DoInitConnection() {
                                      disable_resolver_cache);
   } else {
     ProxyServer proxy_server = proxy_info_.proxy_server();
-    proxy_host_port.reset(new HostPortPair(proxy_server.HostNoBrackets(),
-                                           proxy_server.port()));
+    proxy_host_port.reset(new HostPortPair(proxy_server.host_port_pair()));
     scoped_refptr<TCPSocketParams> proxy_tcp_params =
         new TCPSocketParams(*proxy_host_port, request_->priority,
                             request_->referrer, disable_resolver_cache);
@@ -1254,7 +1255,7 @@ int HttpNetworkTransaction::DoSpdyGetStream() {
   }
 
   CHECK(spdy_session.get());
-  if(spdy_session->IsClosed())
+  if (spdy_session->IsClosed())
     return ERR_CONNECTION_CLOSED;
 
   headers_valid_ = false;
@@ -1722,7 +1723,8 @@ GURL HttpNetworkTransaction::AuthURL(HttpAuth::Target target) const {
           proxy_info_.proxy_server().is_direct()) {
         return GURL();  // There is no proxy server.
       }
-      return GURL("http://" + proxy_info_.proxy_server().host_and_port());
+      return GURL("http://" +
+                  proxy_info_.proxy_server().host_port_pair().ToString());
     case HttpAuth::AUTH_SERVER:
       return request_->url;
     default:
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 03e4b31..11c3965 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -4983,9 +4983,7 @@ TEST_F(HttpNetworkTransactionTest, HonorAlternateProtocolHeader) {
   int rv = trans->Start(&request, &callback, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
-  HostPortPair http_host_port_pair;
-  http_host_port_pair.host = "www.google.com";
-  http_host_port_pair.port = 80;
+  HostPortPair http_host_port_pair("www.google.com", 80);
   const HttpAlternateProtocols& alternate_protocols =
       session->alternate_protocols();
   EXPECT_FALSE(
@@ -5049,9 +5047,7 @@ TEST_F(HttpNetworkTransactionTest, MarkBrokenAlternateProtocol) {
 
   scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
 
-  HostPortPair http_host_port_pair;
-  http_host_port_pair.host = "www.google.com";
-  http_host_port_pair.port = 80;
+  HostPortPair http_host_port_pair("www.google.com", 80);
   HttpAlternateProtocols* alternate_protocols =
       session->mutable_alternate_protocols();
   alternate_protocols->SetAlternateProtocolFor(
@@ -5164,9 +5160,7 @@ TEST_F(HttpNetworkTransactionTest, FailNpnSpdyAndFallback) {
 
   scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
 
-  HostPortPair http_host_port_pair;
-  http_host_port_pair.host = "www.google.com";
-  http_host_port_pair.port = 80;
+  HostPortPair http_host_port_pair("www.google.com", 80);
   HttpAlternateProtocols* alternate_protocols =
       session->mutable_alternate_protocols();
   alternate_protocols->SetAlternateProtocolFor(