Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: net/http/http_server_properties_manager.h

Issue 506523002: net : Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_proxy_client_socket_pool.cc ('k') | net/http/http_transaction_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « net/http/http_proxy_client_socket_pool.cc ('k') | net/http/http_transaction_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698