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 931b12e64c39e7c8b3cb0132d2972bea770634e6..d332aa8fc546e8696b77c8e96f92481d4c1a214b 100644 |
--- a/net/http/http_server_properties_manager.h |
+++ b/net/http/http_server_properties_manager.h |
@@ -223,10 +223,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 +241,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); |
}; |