Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / net / http / http_server_properties_manager.h

diff --git a/src/net/http/http_server_properties_manager.h b/src/net/http/http_server_properties_manager.h
index 931b12e..6c2a8f8 100644 (file)
--- a/src/net/http/http_server_properties_manager.h
+++ b/src/net/http/http_server_properties_manager.h
@@ -153,6 +153,16 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
   // Returns all SPDY persistent settings.
   virtual const SpdySettingsMap& spdy_settings_map() const OVERRIDE;
 
+  // Methods for SupportsQuic.
+  virtual SupportsQuic GetSupportsQuic(
+      const HostPortPair& host_port_pair) const OVERRIDE;
+
+  virtual void SetSupportsQuic(const HostPortPair& host_port_pair,
+                               bool used_quic,
+                               const std::string& address) OVERRIDE;
+
+  virtual const SupportsQuicMap& supports_quic_map() const OVERRIDE;
+
   virtual void SetServerNetworkStats(const HostPortPair& host_port_pair,
                                      NetworkStats stats) OVERRIDE;
 
@@ -185,6 +195,7 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
       SpdySettingsMap* spdy_settings_map,
       AlternateProtocolMap* alternate_protocol_map,
       AlternateProtocolExperiment alternate_protocol_experiment,
+      SupportsQuicMap* supports_quic_map,
       bool detected_corrupted_prefs);
 
   // These are used to delay updating the preferences when cached data in
@@ -212,6 +223,7 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
   void UpdatePrefsOnPrefThread(base::ListValue* spdy_server_list,
                                SpdySettingsMap* spdy_settings_map,
                                AlternateProtocolMap* alternate_protocol_map,
+                               SupportsQuicMap* supports_quic_map,
                                const base::Closure& completion);
 
  private:
@@ -223,10 +235,6 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
 
   const scoped_refptr<base::SequencedTaskRunner> pref_task_runner_;
 
-  // Used to get |weak_ptr_| to self on the pref thread.
-  scoped_ptr<base::WeakPtrFactory<HttpServerPropertiesManager> >
-      pref_weak_ptr_factory_;
-
   base::WeakPtr<HttpServerPropertiesManager> pref_weak_ptr_;
 
   // Used to post cache update tasks.
@@ -245,16 +253,20 @@ class NET_EXPORT HttpServerPropertiesManager : public HttpServerProperties {
 
   const scoped_refptr<base::SequencedTaskRunner> network_task_runner_;
 
-  // Used to get |weak_ptr_| to self on the network thread.
-  scoped_ptr<base::WeakPtrFactory<HttpServerPropertiesManager> >
-      network_weak_ptr_factory_;
-
   // Used to post |prefs::kHttpServerProperties| pref update tasks.
   scoped_ptr<base::OneShotTimer<HttpServerPropertiesManager> >
       network_prefs_update_timer_;
 
   scoped_ptr<HttpServerPropertiesImpl> http_server_properties_impl_;
 
+  // Used to get |weak_ptr_| to self on the pref thread.
+  scoped_ptr<base::WeakPtrFactory<HttpServerPropertiesManager> >
+      pref_weak_ptr_factory_;
+
+  // 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);
 };