SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data.

net/http/http_server_properties_manager.h

 // Copyright 2014 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_MANAGER_H_
 #define NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 99 matching lines @@
   void Clear() override;
   bool SupportsRequestPriority(const url::SchemeHostPort& server) override;
   bool GetSupportsSpdy(const url::SchemeHostPort& server) override;
   void SetSupportsSpdy(const url::SchemeHostPort& server,
                        bool support_spdy) override;
   bool RequiresHTTP11(const HostPortPair& server) override;
   void SetHTTP11Required(const HostPortPair& server) override;
   void MaybeForceHTTP11(const HostPortPair& server,
                         SSLConfig* ssl_config) override;
   AlternativeServiceVector GetAlternativeServices(
-      const HostPortPair& origin) override;
-  bool SetAlternativeService(const HostPortPair& origin,
+      const url::SchemeHostPort& origin) override;
+  bool SetAlternativeService(const url::SchemeHostPort& origin,
                              const AlternativeService& alternative_service,
                              base::Time expiration) override;
-  bool SetAlternativeServices(const HostPortPair& origin,
+  bool SetAlternativeServices(const url::SchemeHostPort& origin,
                               const AlternativeServiceInfoVector&
                                   alternative_service_info_vector) override;
   void MarkAlternativeServiceBroken(
       const AlternativeService& alternative_service) override;
   void MarkAlternativeServiceRecentlyBroken(
       const AlternativeService& alternative_service) override;
   bool IsAlternativeServiceBroken(
       const AlternativeService& alternative_service) const override;
   bool WasAlternativeServiceRecentlyBroken(
       const AlternativeService& alternative_service) override;
   void ConfirmAlternativeService(
       const AlternativeService& alternative_service) override;
-  void ClearAlternativeServices(const HostPortPair& origin) override;
+  void ClearAlternativeServices(const url::SchemeHostPort& origin) override;
   const AlternativeServiceMap& alternative_service_map() const override;
   std::unique_ptr<base::Value> GetAlternativeServiceInfoAsValue()
       const override;
   const SettingsMap& GetSpdySettings(
       const url::SchemeHostPort& server) override;
   bool SetSpdySetting(const url::SchemeHostPort& server,
                       SpdySettingsIds id,
                       SpdySettingsFlags flags,
                       uint32_t value) override;
   void ClearSpdySettings(const url::SchemeHostPort& server) override;
@@ skipping 109 matching lines @@
                       AlternativeServiceMap* alternative_service_map,
                       ServerNetworkStatsMap* network_stats_map);
   void AddToSpdySettingsMap(const url::SchemeHostPort& server,
                             const base::DictionaryValue& server_dict,
                             SpdySettingsMap* spdy_settings_map);
   bool ParseAlternativeServiceDict(
       const base::DictionaryValue& alternative_service_dict,
       const std::string& server_str,
       AlternativeServiceInfo* alternative_service_info);
   bool AddToAlternativeServiceMap(
-      const HostPortPair& server,
+      const url::SchemeHostPort& server,
       const base::DictionaryValue& server_dict,
       AlternativeServiceMap* alternative_service_map);
   bool ReadSupportsQuic(const base::DictionaryValue& server_dict,
                         IPAddress* last_quic_address);
   bool AddToNetworkStatsMap(const url::SchemeHostPort& server,
                             const base::DictionaryValue& server_dict,
                             ServerNetworkStatsMap* network_stats_map);
   bool AddToQuicServerInfoMap(const base::DictionaryValue& server_dict,
                               QuicServerInfoMap* quic_server_info_map);
 
@@ skipping 44 matching lines @@
   // Used to get |weak_ptr_| to self on the network thread.
   std::unique_ptr<base::WeakPtrFactory<HttpServerPropertiesManager>>
       network_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManager);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_