Fix WeakPtrFactory member order in net/url_request/

BUG=303818

Review URL: https://codereview.chromium.org/252003002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272645 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 14 insertions, 13 deletions

diff --git a/net/url_request/url_fetcher_response_writer.cc b/net/url_request/url_fetcher_response_writer.cc
index 5fca1ea..6e3b613 100644
--- a/net/url_request/url_fetcher_response_writer.cc
+++ b/net/url_request/url_fetcher_response_writer.cc
@@ -52,10 +52,10 @@ URLFetcherStringWriter* URLFetcherStringWriter::AsStringWriter() {
 URLFetcherFileWriter::URLFetcherFileWriter(
     scoped_refptr<base::SequencedTaskRunner> file_task_runner,
     const base::FilePath& file_path)
-    : weak_factory_(this),
-      file_task_runner_(file_task_runner),
+    : file_task_runner_(file_task_runner),
       file_path_(file_path),
-      owns_file_(false) {
+      owns_file_(false),
+      weak_factory_(this) {
   DCHECK(file_task_runner_.get());
 }
 
diff --git a/net/url_request/url_fetcher_response_writer.h b/net/url_request/url_fetcher_response_writer.h
index adfcbb8..428f441 100644
--- a/net/url_request/url_fetcher_response_writer.h
+++ b/net/url_request/url_fetcher_response_writer.h
@@ -121,9 +121,6 @@ class NET_EXPORT URLFetcherFileWriter : public URLFetcherResponseWriter {
   // Callback which gets the result of closing a file.
   void CloseComplete(const CompletionCallback& callback, int result);
 
-  // Callbacks are created for use with base::FileUtilProxy.
-  base::WeakPtrFactory<URLFetcherFileWriter> weak_factory_;
-
   // Task runner on which file operations should happen.
   scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
 
@@ -136,6 +133,9 @@ class NET_EXPORT URLFetcherFileWriter : public URLFetcherResponseWriter {
 
   scoped_ptr<FileStream> file_stream_;
 
+  // Callbacks are created for use with base::FileUtilProxy.
+  base::WeakPtrFactory<URLFetcherFileWriter> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(URLFetcherFileWriter);
 };
 
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index 939a226..fec1447 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -34,9 +34,9 @@ URLRequestFtpJob::URLRequestFtpJob(
       pac_request_(NULL),
       http_response_info_(NULL),
       read_in_progress_(false),
-      weak_factory_(this),
       ftp_transaction_factory_(ftp_transaction_factory),
-      ftp_auth_cache_(ftp_auth_cache) {
+      ftp_auth_cache_(ftp_auth_cache),
+      weak_factory_(this) {
   DCHECK(proxy_service_);
   DCHECK(ftp_transaction_factory);
   DCHECK(ftp_auth_cache);
diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h
index 4a064a01..6c40b65 100644
--- a/net/url_request/url_request_ftp_job.h
+++ b/net/url_request/url_request_ftp_job.h
@@ -94,11 +94,11 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob {
 
   scoped_refptr<AuthData> auth_data_;
 
-  base::WeakPtrFactory<URLRequestFtpJob> weak_factory_;
-
   FtpTransactionFactory* ftp_transaction_factory_;
   FtpAuthCache* ftp_auth_cache_;
 
+  base::WeakPtrFactory<URLRequestFtpJob> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(URLRequestFtpJob);
 };
 
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index e3e84d3..a7388d1 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -193,12 +193,12 @@ URLRequestHttpJob::URLRequestHttpJob(
       request_time_snapshot_(),
       final_packet_time_(),
       filter_context_(new HttpFilterContext(this)),
-      weak_factory_(this),
       on_headers_received_callback_(
           base::Bind(&URLRequestHttpJob::OnHeadersReceivedCallback,
                      base::Unretained(this))),
       awaiting_callback_(false),
-      http_user_agent_settings_(http_user_agent_settings) {
+      http_user_agent_settings_(http_user_agent_settings),
+      weak_factory_(this) {
   URLRequestThrottlerManager* manager = request->context()->throttler_manager();
   if (manager)
     throttling_entry_ = manager->RegisterRequestUrl(request->url());
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 @@ class NET_EXPORT_PRIVATE URLRequestHttpJob : public URLRequestJob {
   base::TimeTicks receive_headers_end_;
 
   scoped_ptr<HttpFilterContext> filter_context_;
-  base::WeakPtrFactory<URLRequestHttpJob> weak_factory_;
 
   CompletionCallback on_headers_received_callback_;
 
@@ -271,6 +270,8 @@ class NET_EXPORT_PRIVATE URLRequestHttpJob : public URLRequestJob {
 
   const HttpUserAgentSettings* http_user_agent_settings_;
 
+  base::WeakPtrFactory<URLRequestHttpJob> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(URLRequestHttpJob);
 };