Revert 113338 - Revert 113315 (speculative revert for http://crbug.com/106657)

- Save pipelining capabilities for the most used hosts between sessions.

BUG=None
TEST=unit_tests


Review URL: http://codereview.chromium.org/8770035

TBR=simonjam@chromium.org
Review URL: http://codereview.chromium.org/8833003

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/8832003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113341 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 2 deletions

diff --git a/chrome/browser/net/http_server_properties_manager.h b/chrome/browser/net/http_server_properties_manager.h
index 78c595e..f2e75fd 100644
--- a/chrome/browser/net/http_server_properties_manager.h
+++ b/chrome/browser/net/http_server_properties_manager.h
@@ -17,6 +17,7 @@
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/public/browser/notification_observer.h"
 #include "net/base/host_port_pair.h"
+#include "net/http/http_pipelined_host_capability.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/http_server_properties_impl.h"
 
@@ -122,6 +123,17 @@ class HttpServerPropertiesManager
   // Returns all SpdySettings mappings.
   virtual const net::SpdySettingsMap& spdy_settings_map() const OVERRIDE;
 
+  virtual net::HttpPipelinedHostCapability GetPipelineCapability(
+      const net::HostPortPair& origin) OVERRIDE;
+
+  virtual void SetPipelineCapability(
+      const net::HostPortPair& origin,
+      net::HttpPipelinedHostCapability capability) OVERRIDE;
+
+  virtual void ClearPipelineCapabilities() OVERRIDE;
+
+  virtual net::PipelineCapabilityMap GetPipelineCapabilityMap() const OVERRIDE;
+
  protected:
   // --------------------
   // SPDY related methods
@@ -145,7 +157,8 @@ class HttpServerPropertiesManager
   void UpdateCacheFromPrefsOnIO(
       std::vector<std::string>* spdy_servers,
       net::SpdySettingsMap* spdy_settings_map,
-      net::AlternateProtocolMap* alternate_protocol_map);
+      net::AlternateProtocolMap* alternate_protocol_map,
+      net::PipelineCapabilityMap* pipeline_capability_map);
 
   // These are used to delay updating the preferences when cached data in
   // |http_server_properties_impl_| is changing, and execute only one update per
@@ -167,7 +180,8 @@ class HttpServerPropertiesManager
   void UpdatePrefsOnUI(
       base::ListValue* spdy_server_list,
       net::SpdySettingsMap* spdy_settings_map,
-      net::AlternateProtocolMap* alternate_protocol_map);
+      net::AlternateProtocolMap* alternate_protocol_map,
+      net::PipelineCapabilityMap* pipeline_capability_map);
 
  private:
   // Callback for preference changes.