Change the AlternativeServiceMap with SchemeOriginPair key.

net/http/http_server_properties.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <tuple>
 #include <vector>
 
 #include "base/containers/mru_cache.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_export.h"
 #include "net/quic/quic_bandwidth.h"
 #include "net/quic/quic_server_id.h"
 #include "net/socket/next_proto.h"
 #include "net/spdy/spdy_framer.h"  // TODO(willchan): Reconsider this.
 #include "net/spdy/spdy_protocol.h"
+#include "url/gurl.h"
 
 namespace base {
 class Value;
 }
 
 namespace net {
 
 class IPAddress;
 struct SSLConfig;
 
@@ skipping 163 matching lines @@
   }
 
   bool operator!=(const ServerNetworkStats& other) const {
     return !this->operator==(other);
   }
 
   base::TimeDelta srtt;
   QuicBandwidth bandwidth_estimate;
 };
 
+class NET_EXPORT SchemeOriginPair {

[Ryan Hamilton, 2016/03/24 22:23:14]

I think we should definitely use url::SchemeHostPort unless there is some reason
that doesn't work.

[Zhongyi Shi, 2016/04/04 18:58:35]

Done.

+ public:
+  SchemeOriginPair();
+  SchemeOriginPair(const std::string& in_scheme,
+                   const HostPortPair& in_host_port);
+  // If |in_host| represents an IPv6 address, it should not bracket the address.
+  SchemeOriginPair(const std::string& in_scheme,
+                   const std::string& in_host,
+                   uint16_t in_port);
+
+  const std::string& scheme() const { return scheme_; }
+
+  const HostPortPair& host_port_pair() const { return host_port_pair_; }
+
+  const std::string& host() const { return host_port_pair_.host(); }
+
+  uint16_t port() const { return host_port_pair_.port(); }
+
+  void set_scheme(const std::string& scheme) { scheme_ = scheme; }
+
+  void set_host(const std::string& host) { host_port_pair_.set_host(host); }
+
+  void set_port(uint16_t port) { host_port_pair_.set_port(port); }
+
+  static SchemeOriginPair FromURL(const GURL& url);
+
+  // Equality test of contents. (Probably another violation of style guide).
+  bool Equals(const SchemeOriginPair& other) const;
+
+  bool IsEmpty() const;
+
+  // Allows SchemeOriginPair to be used as a key in STL.
+  bool operator<(const SchemeOriginPair& other) const;
+
+ private:
+  std::string scheme_;
+  HostPortPair host_port_pair_;
+};
+
 typedef std::vector<AlternativeService> AlternativeServiceVector;
 typedef std::vector<AlternativeServiceInfo> AlternativeServiceInfoVector;
-typedef base::MRUCache<HostPortPair, AlternativeServiceInfoVector>
+typedef base::MRUCache<SchemeOriginPair, AlternativeServiceInfoVector>
     AlternativeServiceMap;
 typedef base::MRUCache<HostPortPair, SettingsMap> SpdySettingsMap;
 typedef base::MRUCache<HostPortPair, ServerNetworkStats> ServerNetworkStatsMap;
 typedef base::MRUCache<QuicServerId, std::string> QuicServerInfoMap;
 
 // Persist 5 QUIC Servers. This is mainly used by cronet.
 const int kMaxQuicServersToPersist = 5;
 
 extern const char kAlternateProtocolHeader[];
 extern const char kAlternativeServiceHeader[];
@@ skipping 13 matching lines @@
   virtual ~HttpServerProperties() {}
 
   // Gets a weak pointer for this object.
   virtual base::WeakPtr<HttpServerProperties> GetWeakPtr() = 0;
 
   // Deletes all data.
   virtual void Clear() = 0;
 
   // Returns true if |server| supports a network protocol which honors
   // request prioritization.
-  virtual bool SupportsRequestPriority(const HostPortPair& server) = 0;
+  virtual bool SupportsRequestPriority(const SchemeOriginPair& server) = 0;
 
   // Returns the value set by SetSupportsSpdy(). If not set, returns false.
   virtual bool GetSupportsSpdy(const HostPortPair& server) = 0;

[Ryan Hamilton, 2016/03/24 22:23:14]

Should these next 6 methods also use a SHP?

[Zhongyi Shi, 2016/04/04 18:58:35]

I don't think so, only SupportsRequestPriority queries the Alt-Svc map and the
other methods doesn't refer to that map. 

 
   // Add |server| into the persistent store. Should only be called from IO
   // thread.
   virtual void SetSupportsSpdy(const HostPortPair& server,
                                bool support_spdy) = 0;
 
   // Returns true if |server| has required HTTP/1.1 via HTTP/2 error code.
   virtual bool RequiresHTTP11(const HostPortPair& server) = 0;
 
   // Require HTTP/1.1 on subsequent connections.  Not persisted.
   virtual void SetHTTP11Required(const HostPortPair& server) = 0;
 
   // Modify SSLConfig to force HTTP/1.1.
   static void ForceHTTP11(SSLConfig* ssl_config);
 
   // Modify SSLConfig to force HTTP/1.1 if necessary.
   virtual void MaybeForceHTTP11(const HostPortPair& server,
                                 SSLConfig* ssl_config) = 0;
 
   // Return all alternative services for |origin| with probability greater than
   // or equal to the threshold, including broken ones.
   // Returned alternative services never have empty hostnames.
   virtual AlternativeServiceVector GetAlternativeServices(
-      const HostPortPair& origin) = 0;
+      const SchemeOriginPair& origin) = 0;
 
   // Set a single alternative service for |origin|.  Previous alternative
   // services for |origin| are discarded.
   // |alternative_service.host| may be empty.
   // Return true if |alternative_service_map_| is changed.
   virtual bool SetAlternativeService(
-      const HostPortPair& origin,
+      const SchemeOriginPair& origin,
       const AlternativeService& alternative_service,
       double alternative_probability,
       base::Time expiration) = 0;
 
   // Set alternative services for |origin|.  Previous alternative services for
   // |origin| are discarded.
   // Hostnames in |alternative_service_info_vector| may be empty.
   // Return true if |alternative_service_map_| is changed.
   virtual bool SetAlternativeServices(
-      const HostPortPair& origin,
+      const SchemeOriginPair& origin,
       const AlternativeServiceInfoVector& alternative_service_info_vector) = 0;
 
   // Marks |alternative_service| as broken.
   // |alternative_service.host| must not be empty.
   virtual void MarkAlternativeServiceBroken(
       const AlternativeService& alternative_service) = 0;
 
   // Marks |alternative_service| as recently broken.
   // |alternative_service.host| must not be empty.
   virtual void MarkAlternativeServiceRecentlyBroken(
       const AlternativeService& alternative_service) = 0;
 
   // Returns true iff |alternative_service| is currently broken.
   // |alternative_service.host| must not be empty.
   virtual bool IsAlternativeServiceBroken(
       const AlternativeService& alternative_service) const = 0;
 
   // Returns true iff |alternative_service| was recently broken.
   // |alternative_service.host| must not be empty.
   virtual bool WasAlternativeServiceRecentlyBroken(
       const AlternativeService& alternative_service) = 0;
 
   // Confirms that |alternative_service| is working.
   // |alternative_service.host| must not be empty.
   virtual void ConfirmAlternativeService(
       const AlternativeService& alternative_service) = 0;
 
   // Clear all alternative services for |origin|.
-  virtual void ClearAlternativeServices(const HostPortPair& origin) = 0;
+  virtual void ClearAlternativeServices(const SchemeOriginPair& origin) = 0;
 
   // Returns all alternative service mappings.
   // Returned alternative services may have empty hostnames.
   virtual const AlternativeServiceMap& alternative_service_map() const = 0;
 
   // Returns all alternative service mappings as human readable strings.
   // Empty alternative service hostnames will be printed as such.
   virtual scoped_ptr<base::Value> GetAlternativeServiceInfoAsValue() const = 0;
 
   // Sets the threshold to be used when evaluating alternative service
@@ skipping 57 matching lines @@
   virtual void SetMaxServerConfigsStoredInProperties(
       size_t max_server_configs_stored_in_properties) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_H_