Update param types of HttpServerPropertiesImpl setters and getters. Fix MRU order when loading

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 149 matching lines @@
   const QuicServerInfoMap& quic_server_info_map() const override;
   size_t max_server_configs_stored_in_properties() const override;
   void SetMaxServerConfigsStoredInProperties(
       size_t max_server_configs_stored_in_properties) override;
   bool IsInitialized() const override;
 
   static base::TimeDelta GetUpdateCacheDelayForTesting();
   static base::TimeDelta GetUpdatePrefsDelayForTesting();
 
  protected:
+  typedef std::vector<std::string> ServerList;
+
   // The location where ScheduleUpdatePrefsOnNetworkSequence was called.
   // Must be kept up to date with HttpServerPropertiesUpdatePrefsLocation in
   // histograms.xml.
   enum Location {
     SUPPORTS_SPDY = 0,
     HTTP_11_REQUIRED = 1,
     SET_ALTERNATIVE_SERVICES = 2,
     MARK_ALTERNATIVE_SERVICE_BROKEN = 3,
     MARK_ALTERNATIVE_SERVICE_RECENTLY_BROKEN = 4,
     CONFIRM_ALTERNATIVE_SERVICE = 5,
@@ skipping 19 matching lines @@
 
   // Update cached prefs in |http_server_properties_impl_| with data from
   // preferences. It gets the data on pref thread and calls
   // UpdateSpdyServersFromPrefsOnNetworkThread() to perform the update on
   // network thread.
   virtual void UpdateCacheFromPrefsOnPrefSequence();
 
   // Starts the update of cached prefs in |http_server_properties_impl_| on the
   // network thread. Protected for testing.
   void UpdateCacheFromPrefsOnNetworkSequence(
-      std::vector<std::string>* spdy_servers,
-      AlternativeServiceMap* alternative_service_map,
-      IPAddress* last_quic_address,
-      ServerNetworkStatsMap* server_network_stats_map,
-      QuicServerInfoMap* quic_server_info_map,
+      const ServerList* spdy_servers,

[Zhongyi Shi, 2017/06/20 22:06:19]

Could this be std::unique_ptr<ServerList>?

[wangyix1, 2017/06/21 18:45:33]

Done.

+      std::unique_ptr<AlternativeServiceMap> alternative_service_map,
+      const IPAddress* last_quic_address,
+      std::unique_ptr<ServerNetworkStatsMap> server_network_stats_map,
+      std::unique_ptr<QuicServerInfoMap> quic_server_info_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 alternative_service changes.
   // |location| specifies where this method is called from. Virtual for testing.
   virtual void ScheduleUpdatePrefsOnNetworkSequence(Location location);
 
   // 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 UpdatePrefsFromCacheOnNetworkSequence();
 
   // Same as above, but fires an optional |completion| callback on pref thread
   // when finished. Virtual for testing.
   virtual void UpdatePrefsFromCacheOnNetworkSequence(
       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,
+  void UpdatePrefsOnPrefThread(std::unique_ptr<ServerList> spdy_servers,

[Ryan Hamilton, 2017/06/20 18:25:56]

Instead of passing a unique_ptr here (where all the other args are raw pointers)
and a raw pointer in UpdateCacheFromPrefsOnNetworkSequence (where all the other
args are unique_ptrs) would it make sense to flip them?

[Zhongyi Shi, 2017/06/20 22:06:19]

+1, right now it's a mix of the two. It will be much cleaner to make it
consistent. 

[wangyix1, 2017/06/21 18:45:33]

Ah, I think I just forgot to update these. For
UpdateCacheFromPrefsOnNetworkSequence() and UpdatePrefsOnPrefThread(), I'll make
the first 5 args all unique_ptr since ownership is being transferred to them
after the thread hop.

Done.

[Ryan Hamilton, 2017/06/22 02:45:52]

Sweet! Much cleaner!

                                AlternativeServiceMap* alternative_service_map,
                                IPAddress* last_quic_address,
                                ServerNetworkStatsMap* server_network_stats_map,
                                QuicServerInfoMap* quic_server_info_map,
                                const base::Closure& completion);
 
  private:
-  typedef std::vector<std::string> ServerList;
-
   FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest,
                            AddToAlternativeServiceMap);
   FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest,
                            DoNotLoadAltSvcForInsecureOrigins);
   FRIEND_TEST_ALL_PREFIXES(HttpServerPropertiesManagerTest,
                            DoNotLoadExpiredAlternativeService);
   void OnHttpServerPropertiesChanged();
 
   bool AddServersData(const base::DictionaryValue& server_dict,
                       ServerList* spdy_servers,
@@ skipping 65 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_