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}

4 files changed, 9 insertions, 9 deletions

diff --git a/components/signin/core/browser/signin_manager.cc b/components/signin/core/browser/signin_manager.cc
index 163204d..9525df0 100644
--- a/components/signin/core/browser/signin_manager.cc
+++ b/components/signin/core/browser/signin_manager.cc
@@ -68,9 +68,9 @@ SigninManager::SigninManager(SigninClient* client,
       client_(client),
       token_service_(token_service),
       account_tracker_service_(account_tracker_service),
-      weak_pointer_factory_(this),
       signin_manager_signed_in_(false),
-      user_info_fetched_by_account_tracker_(false) {}
+      user_info_fetched_by_account_tracker_(false),
+      weak_pointer_factory_(this) {}
 
 void SigninManager::AddMergeSessionObserver(
     MergeSessionHelper::Observer* observer) {
diff --git a/components/signin/core/browser/signin_manager.h b/components/signin/core/browser/signin_manager.h
index 04b645a..47e70d07 100644
--- a/components/signin/core/browser/signin_manager.h
+++ b/components/signin/core/browser/signin_manager.h
@@ -226,14 +226,14 @@ class SigninManager : public SigninManagerBase,
   // Helper to merge signed in account into the content area.
   scoped_ptr<MergeSessionHelper> merge_session_helper_;
 
-  base::WeakPtrFactory<SigninManager> weak_pointer_factory_;
-
   // Two gate conditions for when PostSignedIn should be called. Verify
   // that the SigninManager has reached OnSignedIn() and the AccountTracker
   // has completed calling GetUserInfo.
   bool signin_manager_signed_in_;
   bool user_info_fetched_by_account_tracker_;
 
+  base::WeakPtrFactory<SigninManager> weak_pointer_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(SigninManager);
 };
 
diff --git a/components/suggestions/image_manager.h b/components/suggestions/image_manager.h
index 1f7e392..99ae55e 100644
--- a/components/suggestions/image_manager.h
+++ b/components/suggestions/image_manager.h
@@ -136,10 +136,10 @@ class ImageManager : public ImageFetcherDelegate {
 
   bool database_ready_;
 
-  base::WeakPtrFactory<ImageManager> weak_ptr_factory_;
-
   base::ThreadChecker thread_checker_;
 
+  base::WeakPtrFactory<ImageManager> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ImageManager);
 };
 
diff --git a/components/sync_driver/device_info_data_type_controller_unittest.cc b/components/sync_driver/device_info_data_type_controller_unittest.cc
index 18e4a5b..e1c4af3 100644
--- a/components/sync_driver/device_info_data_type_controller_unittest.cc
+++ b/components/sync_driver/device_info_data_type_controller_unittest.cc
@@ -22,8 +22,8 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
  public:
   DeviceInfoDataTypeControllerTest()
       : load_finished_(false),
-        weak_ptr_factory_(this),
-        last_type_(syncer::UNSPECIFIED) {}
+        last_type_(syncer::UNSPECIFIED),
+        weak_ptr_factory_(this) {}
   ~DeviceInfoDataTypeControllerTest() override {}
 
   void SetUp() override {
@@ -108,9 +108,9 @@ class DeviceInfoDataTypeControllerTest : public testing::Test,
 
  private:
   base::MessageLoopForUI message_loop_;
-  base::WeakPtrFactory<DeviceInfoDataTypeControllerTest> weak_ptr_factory_;
   syncer::ModelType last_type_;
   syncer::SyncError last_error_;
+  base::WeakPtrFactory<DeviceInfoDataTypeControllerTest> weak_ptr_factory_;
 };
 
 TEST_F(DeviceInfoDataTypeControllerTest, StartModels) {