Fix remaining WeakPtrFactory ordering problems in preparation for turning on the check.

WeakPtrFactory members should always be last so that they invalidate WeakPtrs prior to other destructors running. These are mostly trivial/mechanical ones.

(We'll also need https://codereview.chromium.org/795003003/, which I split out)

BUG=303818
TBR=rockot,vitalybuka,cbentzel,shess,dmazzoni,stanisc,sky,tim,mathp,benjhayden,kinuko,scottmg,sergeyu,zork,ddorwin

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

Cr-Commit-Position: refs/heads/master@{#308137}

9 files changed, 24 insertions, 21 deletions

diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc
index a011fc9..9ba699b 100644
--- a/content/browser/download/download_browsertest.cc
+++ b/content/browser/download/download_browsertest.cc
@@ -173,9 +173,9 @@ class DownloadFileWithDelayFactory : public DownloadFileFactory {
   void WaitForSomeCallback();
 
  private:
-  base::WeakPtrFactory<DownloadFileWithDelayFactory> weak_ptr_factory_;
   std::vector<base::Closure> rename_callbacks_;
   bool waiting_;
+  base::WeakPtrFactory<DownloadFileWithDelayFactory> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileWithDelayFactory);
 };
@@ -228,8 +228,9 @@ void DownloadFileWithDelay::RenameCallbackWrapper(
 }
 
 DownloadFileWithDelayFactory::DownloadFileWithDelayFactory()
-    : weak_ptr_factory_(this),
-      waiting_(false) {}
+    : waiting_(false),
+      weak_ptr_factory_(this) {}
+
 DownloadFileWithDelayFactory::~DownloadFileWithDelayFactory() {}
 
 DownloadFile* DownloadFileWithDelayFactory::CreateFile(
diff --git a/content/browser/fileapi/file_system_quota_client_unittest.cc b/content/browser/fileapi/file_system_quota_client_unittest.cc
index 747c662..5ab33e1 100644
--- a/content/browser/fileapi/file_system_quota_client_unittest.cc
+++ b/content/browser/fileapi/file_system_quota_client_unittest.cc
@@ -40,9 +40,9 @@ const storage::StorageType kPersistent = storage::kStorageTypePersistent;
 class FileSystemQuotaClientTest : public testing::Test {
  public:
   FileSystemQuotaClientTest()
-      : weak_factory_(this),
-        additional_callback_count_(0),
-        deletion_status_(storage::kQuotaStatusUnknown) {}
+      : additional_callback_count_(0),
+        deletion_status_(storage::kQuotaStatusUnknown),
+        weak_factory_(this) {}
 
   void SetUp() override {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
@@ -230,11 +230,11 @@ class FileSystemQuotaClientTest : public testing::Test {
   base::ScopedTempDir data_dir_;
   base::MessageLoop message_loop_;
   scoped_refptr<storage::FileSystemContext> file_system_context_;
-  base::WeakPtrFactory<FileSystemQuotaClientTest> weak_factory_;
   int64 usage_;
   int additional_callback_count_;
   std::set<GURL> origins_;
   storage::QuotaStatusCode deletion_status_;
+  base::WeakPtrFactory<FileSystemQuotaClientTest> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemQuotaClientTest);
 };
diff --git a/content/browser/fileapi/file_system_url_request_job_unittest.cc b/content/browser/fileapi/file_system_url_request_job_unittest.cc
index 4dcba3b..5eb7fdb 100644
--- a/content/browser/fileapi/file_system_url_request_job_unittest.cc
+++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc
@@ -251,7 +251,6 @@ class FileSystemURLRequestJobTest : public testing::Test {
 
   base::ScopedTempDir temp_dir_;
   scoped_refptr<storage::FileSystemContext> file_system_context_;
-  base::WeakPtrFactory<FileSystemURLRequestJobTest> weak_factory_;
 
   net::URLRequestContext empty_context_;
   scoped_ptr<FileSystemURLRequestJobFactory> job_factory_;
@@ -259,6 +258,8 @@ class FileSystemURLRequestJobTest : public testing::Test {
   // NOTE: order matters, request must die before delegate
   scoped_ptr<net::TestDelegate> delegate_;
   scoped_ptr<net::URLRequest> request_;
+
+  base::WeakPtrFactory<FileSystemURLRequestJobTest> weak_factory_;
 };
 
 namespace {
diff --git a/content/browser/fileapi/obfuscated_file_util_unittest.cc b/content/browser/fileapi/obfuscated_file_util_unittest.cc
index cef3990..7abaf7e 100644
--- a/content/browser/fileapi/obfuscated_file_util_unittest.cc
+++ b/content/browser/fileapi/obfuscated_file_util_unittest.cc
@@ -146,10 +146,10 @@ class ObfuscatedFileUtilTest : public testing::Test {
   ObfuscatedFileUtilTest()
       : origin_(GURL("http://www.example.com")),
         type_(storage::kFileSystemTypeTemporary),
-        weak_factory_(this),
         sandbox_file_system_(origin_, type_),
         quota_status_(storage::kQuotaStatusUnknown),
-        usage_(-1) {}
+        usage_(-1),
+        weak_factory_(this) {}
 
   void SetUp() override {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
@@ -802,12 +802,12 @@ class ObfuscatedFileUtilTest : public testing::Test {
   scoped_refptr<FileSystemContext> file_system_context_;
   GURL origin_;
   storage::FileSystemType type_;
-  base::WeakPtrFactory<ObfuscatedFileUtilTest> weak_factory_;
   SandboxFileSystemTestHelper sandbox_file_system_;
   storage::QuotaStatusCode quota_status_;
   int64 usage_;
   storage::MockFileChangeObserver change_observer_;
   storage::ChangeObserverList change_observers_;
+  base::WeakPtrFactory<ObfuscatedFileUtilTest> weak_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileUtilTest);
diff --git a/content/browser/gamepad/gamepad_provider_unittest.cc b/content/browser/gamepad/gamepad_provider_unittest.cc
index e4f6571..eaea2c6 100644
--- a/content/browser/gamepad/gamepad_provider_unittest.cc
+++ b/content/browser/gamepad/gamepad_provider_unittest.cc
@@ -21,8 +21,8 @@ using blink::WebGamepads;
 class UserGestureListener {
  public:
   UserGestureListener()
-      : weak_factory_(this),
-        has_user_gesture_(false) {
+      : has_user_gesture_(false),
+        weak_factory_(this) {
   }
 
   base::Closure GetClosure() {
@@ -37,8 +37,8 @@ class UserGestureListener {
     has_user_gesture_ = true;
   }
 
-  base::WeakPtrFactory<UserGestureListener> weak_factory_;
   bool has_user_gesture_;
+  base::WeakPtrFactory<UserGestureListener> weak_factory_;
 };
 
 // Main test fixture
diff --git a/content/browser/renderer_host/p2p/socket_host.cc b/content/browser/renderer_host/p2p/socket_host.cc
index 8f6e71f..6358eff 100644
--- a/content/browser/renderer_host/p2p/socket_host.cc
+++ b/content/browser/renderer_host/p2p/socket_host.cc
@@ -463,12 +463,12 @@ P2PSocketHost::P2PSocketHost(IPC::Sender* message_sender,
       state_(STATE_UNINITIALIZED),
       dump_incoming_rtp_packet_(false),
       dump_outgoing_rtp_packet_(false),
-      weak_ptr_factory_(this),
       protocol_type_(protocol_type),
       send_packets_delayed_total_(0),
       send_packets_total_(0),
       send_bytes_delayed_max_(0),
-      send_bytes_delayed_cur_(0) {
+      send_bytes_delayed_cur_(0),
+      weak_ptr_factory_(this) {
 }
 
 P2PSocketHost::~P2PSocketHost() {
diff --git a/content/browser/renderer_host/p2p/socket_host.h b/content/browser/renderer_host/p2p/socket_host.h
index 390c115..b569a0a 100644
--- a/content/browser/renderer_host/p2p/socket_host.h
+++ b/content/browser/renderer_host/p2p/socket_host.h
@@ -160,8 +160,6 @@ class CONTENT_EXPORT P2PSocketHost {
   bool dump_outgoing_rtp_packet_;
   RenderProcessHost::WebRtcRtpPacketCallback packet_dump_callback_;
 
-  base::WeakPtrFactory<P2PSocketHost> weak_ptr_factory_;
-
   ProtocolType protocol_type_;
 
  private:
@@ -175,6 +173,8 @@ class CONTENT_EXPORT P2PSocketHost {
   int32 send_bytes_delayed_max_;
   int32 send_bytes_delayed_cur_;
 
+  base::WeakPtrFactory<P2PSocketHost> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(P2PSocketHost);
 };
 
diff --git a/content/browser/streams/stream_url_request_job.cc b/content/browser/streams/stream_url_request_job.cc
index 6d70eef..3d4ac7f 100644
--- a/content/browser/streams/stream_url_request_job.cc
+++ b/content/browser/streams/stream_url_request_job.cc
@@ -21,13 +21,13 @@ StreamURLRequestJob::StreamURLRequestJob(
     net::NetworkDelegate* network_delegate,
     scoped_refptr<Stream> stream)
     : net::URLRequestJob(request, network_delegate),
-      weak_factory_(this),
       stream_(stream),
       headers_set_(false),
       pending_buffer_size_(0),
       total_bytes_read_(0),
       max_range_(0),
-      request_failed_(false) {
+      request_failed_(false),
+      weak_factory_(this) {
   DCHECK(stream_.get());
   stream_->SetReadObserver(this);
 }
diff --git a/content/browser/streams/stream_url_request_job.h b/content/browser/streams/stream_url_request_job.h
index 17e7eb2..05c9551 100644
--- a/content/browser/streams/stream_url_request_job.h
+++ b/content/browser/streams/stream_url_request_job.h
@@ -44,7 +44,6 @@ class CONTENT_EXPORT StreamURLRequestJob
   void HeadersCompleted(net::HttpStatusCode status_code);
   void ClearStream();
 
-  base::WeakPtrFactory<StreamURLRequestJob> weak_factory_;
   scoped_refptr<content::Stream> stream_;
   bool headers_set_;
   scoped_refptr<net::IOBuffer> pending_buffer_;
@@ -55,6 +54,8 @@ class CONTENT_EXPORT StreamURLRequestJob
   int max_range_;
   bool request_failed_;
 
+  base::WeakPtrFactory<StreamURLRequestJob> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(StreamURLRequestJob);
 };