Introduce AlternativeServiceInfo.

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 <string>
 #include <vector>
 
@@ skipping 83 matching lines @@
       const AlternativeService& alternative_service) override;
   void MarkAlternativeServiceRecentlyBroken(
       const AlternativeService& alternative_service) override;
   bool IsAlternativeServiceBroken(
       const AlternativeService& alternative_service) override;
   bool WasAlternativeServiceRecentlyBroken(
       const AlternativeService& alternative_service) override;
   void ConfirmAlternativeService(
       const AlternativeService& alternative_service) override;
   void ClearAlternativeService(const HostPortPair& origin) override;
-  const AlternateProtocolMap& alternate_protocol_map() const override;
+  const AlternativeServiceMap& alternative_service_map() const override;
   void SetAlternateProtocolProbabilityThreshold(double threshold) override;
   const SettingsMap& GetSpdySettings(
       const HostPortPair& host_port_pair) override;
   bool SetSpdySetting(const HostPortPair& host_port_pair,
                       SpdySettingsIds id,
                       SpdySettingsFlags flags,
                       uint32 value) override;
   void ClearSpdySettings(const HostPortPair& host_port_pair) override;
   void ClearAllSpdySettings() override;
   const SpdySettingsMap& spdy_settings_map() const override;
@@ skipping 23 matching lines @@
   // preferences. It gets the data on pref thread and calls
   // UpdateSpdyServersFromPrefsOnNetworkThread() to perform the update on
   // network thread.
   virtual void UpdateCacheFromPrefsOnPrefThread();
 
   // Starts the update of cached prefs in |http_server_properties_impl_| on the
   // network thread. Protected for testing.
   void UpdateCacheFromPrefsOnNetworkThread(
       std::vector<std::string>* spdy_servers,
       SpdySettingsMap* spdy_settings_map,
-      AlternateProtocolMap* alternate_protocol_map,
+      AlternativeServiceMap* alternative_service_map,
       IPAddressNumber* last_quic_address,
       ServerNetworkStatsMap* server_network_stats_map,
       bool detected_corrupted_prefs);
 
   // These are used to delay updating the preferences when cached data in
   // |http_server_properties_impl_| is changing, and execute only one update per
-  // simultaneous spdy_servers or spdy_settings or alternate_protocol changes.
+  // simultaneous spdy_servers or spdy_settings or alternative_service changes.
   void ScheduleUpdatePrefsOnNetworkThread();
 
   // Starts the timers to update the prefs from cache. This are overridden in
   // tests to prevent the delay.
   virtual void StartPrefsUpdateTimerOnNetworkThread(base::TimeDelta delay);
 
   // Update prefs::kHttpServerProperties in preferences with the cached data
   // from |http_server_properties_impl_|. This gets the data on network thread
   // and posts a task (UpdatePrefsOnPrefThread) to update preferences on pref
   // thread.
   void UpdatePrefsFromCacheOnNetworkThread();
 
   // Same as above, but fires an optional |completion| callback on pref thread
   // when finished. Virtual for testing.
   virtual void UpdatePrefsFromCacheOnNetworkThread(
       const base::Closure& completion);
 
   // Update prefs::kHttpServerProperties preferences on pref thread. Executes an
   // optional |completion| callback when finished. Protected for testing.
   void UpdatePrefsOnPrefThread(base::ListValue* spdy_server_list,
                                SpdySettingsMap* spdy_settings_map,
-                               AlternateProtocolMap* alternate_protocol_map,
+                               AlternativeServiceMap* alternative_service_map,
                                IPAddressNumber* last_quic_address,
                                ServerNetworkStatsMap* server_network_stats_map,
                                const base::Closure& completion);
 
  private:
   void OnHttpServerPropertiesChanged();
 
   bool ReadSupportsQuic(const base::DictionaryValue& server_dict,
                         IPAddressNumber* last_quic_address);
   void AddToSpdySettingsMap(const HostPortPair& server,
                             const base::DictionaryValue& server_dict,
                             SpdySettingsMap* spdy_settings_map);
-  AlternateProtocolInfo ParseAlternateProtocolDict(
-      const base::DictionaryValue& alternate_protocol_dict,
+  AlternativeServiceInfo ParseAlternativeServiceDict(
+      const base::DictionaryValue& alternative_service_dict,
       const std::string& server_str);
-  bool AddToAlternateProtocolMap(const HostPortPair& server,
-                                 const base::DictionaryValue& server_dict,
-                                 AlternateProtocolMap* alternate_protocol_map);
+  bool AddToAlternativeServiceMap(
+      const HostPortPair& server,
+      const base::DictionaryValue& server_dict,
+      AlternativeServiceMap* alternative_service_map);
   bool AddToNetworkStatsMap(const HostPortPair& server,
                             const base::DictionaryValue& server_dict,
                             ServerNetworkStatsMap* network_stats_map);
 
   void SaveSpdySettingsToServerPrefs(const SettingsMap* spdy_settings_map,
                                      base::DictionaryValue* server_pref_dict);
-  void SaveAlternateProtocolToServerPrefs(
-      const AlternateProtocolInfo* port_alternate_protocol,
+  void SaveAlternativeServiceToServerPrefs(
+      const AlternativeServiceInfo* alternative_service_info,
       base::DictionaryValue* server_pref_dict);
   void SaveNetworkStatsToServerPrefs(
       const ServerNetworkStats* server_network_stats,
       base::DictionaryValue* server_pref_dict);
 
   void SaveSupportsQuicToPrefs(
       const IPAddressNumber* last_quic_address,
       base::DictionaryValue* http_server_properties_dict);
 
   // -----------
@@ skipping 33 matching lines @@
   // Used to get |weak_ptr_| to self on the network thread.
   scoped_ptr<base::WeakPtrFactory<HttpServerPropertiesManager> >
       network_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManager);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_MANAGER_H_