Make ProfileSyncService's WeakPtrFactory the last member

chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 1095 matching lines @@
 
   // ProfileSyncService needs to hold reference to access_token_request_ for
   // the duration of request in order to receive callbacks.
   scoped_ptr<OAuth2TokenService::Request> access_token_request_;
 
   // If RequestAccessToken fails with transient error then retry requesting
   // access token with exponential backoff.
   base::OneShotTimer<ProfileSyncService> request_access_token_retry_timer_;
   net::BackoffEntry request_access_token_backoff_;
 
-  base::WeakPtrFactory<ProfileSyncService> weak_factory_;
-
-  // We don't use |weak_factory_| for the StartupController because the weak
-  // ptrs should be bound to the lifetime of ProfileSyncService and not to the
-  // [Initialize -> sync disabled/shutdown] lifetime.  We don't pass
-  // StartupController an Unretained reference to future-proof against
-  // the controller impl changing to post tasks. Therefore, we have a separate
-  // factory.
-  base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_;
-
   // States related to sync token and connection.
   base::Time connection_status_update_time_;
   syncer::ConnectionStatus connection_status_;
   base::Time token_request_time_;
   base::Time token_receive_time_;
   GoogleServiceAuthError last_get_token_error_;
   base::Time next_token_request_time_;
 
   scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device_;
 
   // Locally owned SyncableService implementations.
   scoped_ptr<browser_sync::SessionsSyncManager> sessions_sync_manager_;
   scoped_ptr<sync_driver::DeviceInfoSyncService> device_info_sync_service_;
 
   scoped_ptr<syncer::NetworkResources> network_resources_;
 
-  browser_sync::StartupController startup_controller_;
+  scoped_ptr<browser_sync::StartupController> startup_controller_;
 
-  browser_sync::BackupRollbackController backup_rollback_controller_;
+  scoped_ptr<browser_sync::BackupRollbackController>
+      backup_rollback_controller_;
 
   // Mode of current backend.
   BackendMode backend_mode_;
 
   // Whether backup is needed before sync starts.
   bool need_backup_;
 
   // Whether backup is finished.
   bool backup_finished_;
 
   base::Time backup_start_time_;
 
   base::Callback<
       void(BrowsingDataRemover::Observer*, Profile*, base::Time, base::Time)>
       clear_browsing_data_;
 
   // Last time when pre-sync data was saved. NULL pointer means backup data
   // state is unknown. If time value is null, backup data doesn't exist.
   scoped_ptr<base::Time> last_backup_time_;
 
   BrowsingDataRemover::Observer* browsing_data_remover_observer_;
 
   // The full path to the sync data directory.
   base::FilePath directory_path_;
 
+  base::WeakPtrFactory<ProfileSyncService> weak_factory_;
+
+  // We don't use |weak_factory_| for the StartupController because the weak
+  // ptrs should be bound to the lifetime of ProfileSyncService and not to the
+  // [Initialize -> sync disabled/shutdown] lifetime.  We don't pass
+  // StartupController an Unretained reference to future-proof against
+  // the controller impl changing to post tasks. Therefore, we have a separate
+  // factory.
+  base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const syncer::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_