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

Unified Diff: net/proxy/proxy_service.cc

Issue 595913003: Declaring the weak_ptr_factory in proper order in src/net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added entry in AUTHORS file. Created 6 years, 3 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 | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 9b0b731c637f6b2734483a3801bd3fdc51a3ef91..47a4dc2434c60b2a3d91b220194c5f46d93f4a69 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -557,15 +557,15 @@ class ProxyService::ProxyScriptDeciderPoller {
int init_net_error,
ProxyResolverScriptData* init_script_data,
NetLog* net_log)
- : weak_factory_(this),
- change_callback_(callback),
+ : change_callback_(callback),
config_(config),
proxy_resolver_expects_pac_bytes_(proxy_resolver_expects_pac_bytes),
proxy_script_fetcher_(proxy_script_fetcher),
dhcp_proxy_script_fetcher_(dhcp_proxy_script_fetcher),
last_error_(init_net_error),
last_script_data_(init_script_data),
- last_poll_time_(TimeTicks::Now()) {
+ last_poll_time_(TimeTicks::Now()),
+ weak_factory_(this) {
// Set the initial poll delay.
next_poll_mode_ = poll_policy()->GetNextDelay(
last_error_, TimeDelta::FromSeconds(-1), &next_poll_delay_);
@@ -694,8 +694,6 @@ class ProxyService::ProxyScriptDeciderPoller {
change_callback_.Run(result, script_data.get(), effective_config);
}
- base::WeakPtrFactory<ProxyScriptDeciderPoller> weak_factory_;
-
ChangeCallback change_callback_;
ProxyConfig config_;
bool proxy_resolver_expects_pac_bytes_;
@@ -719,6 +717,8 @@ class ProxyService::ProxyScriptDeciderPoller {
bool quick_check_enabled_;
+ base::WeakPtrFactory<ProxyScriptDeciderPoller> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(ProxyScriptDeciderPoller);
};
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698