Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index d5aa5ba..b7ac50c 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -248,7 +248,6 @@
base::TimeTicks receive_headers_end_;
scoped_ptr<HttpFilterContext> filter_context_;
- base::WeakPtrFactory<URLRequestHttpJob> weak_factory_;
CompletionCallback on_headers_received_callback_;
@@ -271,6 +270,8 @@
const HttpUserAgentSettings* http_user_agent_settings_;
+ base::WeakPtrFactory<URLRequestHttpJob> weak_factory_;
+
DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob);
};