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

chrome/browser/net/http_server_properties_manager.h

 // Copyright (c) 2011 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 CHROME_BROWSER_NET_HTTP_SERVER_PROPERTIES_MANAGER_H_
 #define CHROME_BROWSER_NET_HTTP_SERVER_PROPERTIES_MANAGER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer.h"
 #include "base/values.h"
 #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"
 
 class PrefService;
 
 namespace chrome_browser_net {
 
 ////////////////////////////////////////////////////////////////////////////////
 //  HttpServerPropertiesManager
 
@@ skipping 85 matching lines @@
   virtual bool SetSpdySettings(
       const net::HostPortPair& host_port_pair,
       const spdy::SpdySettings& settings) OVERRIDE;
 
   // Clears all spdy_settings.
   virtual void ClearSpdySettings() OVERRIDE;
 
   // 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
 
   // These are used to delay updating of the cached data in
   // |http_server_properties_impl_| while the preferences are changing, and
   // execute only one update per simultaneous prefs changes.
   void ScheduleUpdateCacheOnUI();
 
   // Starts the timers to update the cached prefs. This are overridden in tests
   // to prevent the delay.
   virtual void StartCacheUpdateTimerOnUI(base::TimeDelta delay);
 
   // Update cached prefs in |http_server_properties_impl_| with data from
   // preferences. It gets the data on UI thread and calls
   // UpdateSpdyServersFromPrefsOnIO() to perform the update on IO thread.
   virtual void UpdateCacheFromPrefsOnUI();
 
   // Starts the update of cached prefs in |http_server_properties_impl_| on the
   // IO thread. Protected for testing.
   void UpdateCacheFromPrefsOnIO(
       std::vector<std::string>* spdy_servers,
       net::SpdySettingsMap* spdy_settings_map,
-      net::AlternateProtocolMap* alternate_protocol_map,
-      net::PipelineCapabilityMap* pipeline_capability_map);
+      net::AlternateProtocolMap* alternate_protocol_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
   // simultaneous spdy_servers or spdy_settings or alternate_protocol changes.
   void ScheduleUpdatePrefsOnIO();
 
   // Starts the timers to update the prefs from cache. This are overridden in
   // tests to prevent the delay.
   virtual void StartPrefsUpdateTimerOnIO(base::TimeDelta delay);
 
   // Update prefs::kHttpServerProperties in preferences with the cached data
   // from |http_server_properties_impl_|. This gets the data on IO thread and
   // posts a task (UpdatePrefsOnUI) to update the preferences UI thread.
   // Virtual for testing.
   virtual void UpdatePrefsFromCacheOnIO();
 
   // Update prefs::kHttpServerProperties preferences on UI thread. Protected for
   // testing.
   void UpdatePrefsOnUI(
       base::ListValue* spdy_server_list,
       net::SpdySettingsMap* spdy_settings_map,
-      net::AlternateProtocolMap* alternate_protocol_map,
-      net::PipelineCapabilityMap* pipeline_capability_map);
+      net::AlternateProtocolMap* alternate_protocol_map);
 
  private:
   // Callback for preference changes.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ---------
   // UI thread
   // ---------
@@ skipping 22 matching lines @@
       io_prefs_update_timer_;
 
   scoped_ptr<net::HttpServerPropertiesImpl> http_server_properties_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManager);
 };
 
 }  // namespace chrome_browser_net
 
 #endif  // CHROME_BROWSER_NET_HTTP_SERVER_PROPERTIES_MANAGER_H_