Refactor: change the spdy session pool key to take a ProxyServer instead of a stri...

net/proxy/proxy_server.cc

 // Copyright (c) 2010 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/proxy/proxy_server.h"
 
 #include <algorithm>
 
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
@@ skipping 54 matching lines @@
   const std::string::size_type len = host.size();
   if (len >= 2 && host[0] == '[' && host[len - 1] == ']')
     return host.substr(1, len - 2);
   return host;
 }
 
 }  // namespace
 
 ProxyServer::ProxyServer(Scheme scheme, const HostPortPair& host_port_pair)
       : scheme_(scheme), host_port_pair_(host_port_pair) {
+  if (scheme_ == SCHEME_DIRECT || scheme_ == SCHEME_INVALID) {
+    // |host_port_pair| isn't relevant for these special schemes, so none should
+    // have been specified. It is important for this to be consistent since we
+    // do raw field comparisons in the equality and comparison functions.
+    DCHECK(host_port_pair.Equals(HostPortPair()));
+    host_port_pair_ = HostPortPair();
+  }
 }
 
 const HostPortPair& ProxyServer::host_port_pair() const {
   // Doesn't make sense to call this if the URI scheme doesn't
   // have concept of a host.
   DCHECK(is_valid() && !is_direct());
   return host_port_pair_;
 }
 
 // static
@@ skipping 116 matching lines @@
     Scheme scheme,
     std::string::const_iterator begin,
     std::string::const_iterator end) {
 
   // Trim leading/trailing space.
   HttpUtil::TrimLWS(&begin, &end);
 
   if (scheme == SCHEME_DIRECT && begin != end)
     return ProxyServer();  // Invalid -- DIRECT cannot have a host/port.
 
-  std::string host;
-  int port = -1;
+  HostPortPair host_port_pair;
 
   if (scheme != SCHEME_INVALID && scheme != SCHEME_DIRECT) {
+    std::string host;
+    int port = -1;
     // If the scheme has a host/port, parse it.
     bool ok = net::ParseHostAndPort(begin, end, &host, &port);
     if (!ok)
       return ProxyServer();  // Invalid -- failed parsing <host>[":"<port>]
+
+    // Choose a default port number if none was given.
+    if (port == -1)
+      port = GetDefaultPortForScheme(scheme);
+
+    host_port_pair = HostPortPair(HostNoBrackets(host), port);
   }
 
-  // Choose a default port number if none was given.
-  if (port == -1)
-    port = GetDefaultPortForScheme(scheme);
-
-  return ProxyServer(scheme, HostPortPair(HostNoBrackets(host), port));
+  return ProxyServer(scheme, host_port_pair);
 }
 
 }  // namespace net