HttpServerProperties - Minor reorganization of code in preperation of

net/http/http_server_properties_manager.h

Index: net/http/http_server_properties_manager.h
diff --git a/net/http/http_server_properties_manager.h b/net/http/http_server_properties_manager.h
index ef881572c5a450828da79c7a82f1a2682415168f..4617ef7af970bbd99dd5537263a45852a07ced67 100644
--- a/net/http/http_server_properties_manager.h
+++ b/net/http/http_server_properties_manager.h
@@ -216,14 +216,19 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
                                const base::Closure& completion);
 
  private:
+  typedef std::vector<std::string> StringVector;

[Ryan Hamilton, 2015/12/22 18:25:32]

If this is only used for the SPDY server list, then how about "ServerList" as
the data type to describe the function, not the form.

[ramant (doing other things), 2015/12/22 20:00:09]

Done.

+
   FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest,
                            AddToAlternativeServiceMap);
   FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest,
                            DoNotLoadExpiredAlternativeService);
   void OnHttpServerPropertiesChanged();
 
-  bool ReadSupportsQuic(const base::DictionaryValue& server_dict,
-                        IPAddressNumber* last_quic_address);
+  bool AddServersData(const base::DictionaryValue& server_dict,
+                      StringVector* spdy_servers,
+                      SpdySettingsMap* spdy_settings_map,
+                      AlternativeServiceMap* alternative_service_map,
+                      ServerNetworkStatsMap* network_stats_map);
   void AddToSpdySettingsMap(const HostPortPair& server,
                             const base::DictionaryValue& server_dict,
                             SpdySettingsMap* spdy_settings_map);
@@ -235,6 +240,8 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
       const HostPortPair& server,
       const base::DictionaryValue& server_dict,
       AlternativeServiceMap* alternative_service_map);
+  bool ReadSupportsQuic(const base::DictionaryValue& server_dict,
+                        IPAddressNumber* last_quic_address);
   bool AddToNetworkStatsMap(const HostPortPair& server,
                             const base::DictionaryValue& server_dict,
                             ServerNetworkStatsMap* network_stats_map);
@@ -246,15 +253,15 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
   void SaveAlternativeServiceToServerPrefs(
       const AlternativeServiceInfoVector* alternative_service_info_vector,
       base::DictionaryValue* server_pref_dict);
+  void SaveSupportsQuicToPrefs(
+      const IPAddressNumber* last_quic_address,
+      base::DictionaryValue* http_server_properties_dict);
   void SaveNetworkStatsToServerPrefs(
       const ServerNetworkStats* server_network_stats,
       base::DictionaryValue* server_pref_dict);
   void SaveQuicServerInfoMapToServerPrefs(
       QuicServerInfoMap* quic_server_info_map,
       base::DictionaryValue* http_server_properties_dict);
-  void SaveSupportsQuicToPrefs(
-      const IPAddressNumber* last_quic_address,
-      base::DictionaryValue* http_server_properties_dict);
 
   // -----------
   // Pref thread