Componentize chrome/browser/sync/backup_rollback_controller

chrome/browser/sync/profile_sync_service.cc

 // 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.
 
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <cstddef>
 #include <map>
 #include <vector>
 
@@ skipping 240 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(profile);
   startup_controller_.reset(new browser_sync::StartupController(
       start_behavior,
       oauth2_token_service,
       &sync_prefs_,
       signin_.get(),
       base::Bind(&ProfileSyncService::StartUpSlowBackendComponents,
                  startup_controller_weak_factory_.GetWeakPtr(),
                  SYNC)));
-  backup_rollback_controller_.reset(new browser_sync::BackupRollbackController(
+  backup_rollback_controller_.reset(new sync_driver::BackupRollbackController(
       &sync_prefs_,
       signin_.get(),
       base::Bind(&ProfileSyncService::StartUpSlowBackendComponents,
                  startup_controller_weak_factory_.GetWeakPtr(),
                  BACKUP),
       base::Bind(&ProfileSyncService::StartUpSlowBackendComponents,
                  startup_controller_weak_factory_.GetWeakPtr(),
                  ROLLBACK)));
   syncer::SyncableService::StartSyncFlare flare(
       sync_start_util::GetFlareForSyncableService(profile->GetPath()));
@@ skipping 82 matching lines @@
 #endif
 
 #if !defined(OS_ANDROID)
   DCHECK(sync_error_controller_ == NULL)
       << "Initialize() called more than once.";
   sync_error_controller_.reset(new SyncErrorController(this));
   AddObserver(sync_error_controller_.get());
 #endif
 
   bool running_rollback = false;
-  if (browser_sync::BackupRollbackController::IsBackupEnabled()) {
+  if (sync_driver::BackupRollbackController::IsBackupEnabled()) {
     // Backup is needed if user's not signed in or signed in but previous
     // backup didn't finish, i.e. backend didn't switch from backup to sync.
     need_backup_ = !IsSignedIn() || sync_prefs_.GetFirstSyncTime().is_null();
 
     // Try to resume rollback if it didn't finish in last session.
     running_rollback = backup_rollback_controller_->StartRollback();
   } else {
     need_backup_ = false;
   }
 
@@ skipping 1856 matching lines @@
     // Track the fact that we're still waiting for auth to complete.
     is_auth_in_progress_ = true;
   }
 }
 
 void ProfileSyncService::GoogleSignedOut(const std::string& account_id,
                                          const std::string& username) {
   sync_disabled_by_admin_ = false;
   RequestStop(CLEAR_DATA);
 
-  if (browser_sync::BackupRollbackController::IsBackupEnabled()) {
+  if (sync_driver::BackupRollbackController::IsBackupEnabled()) {
     need_backup_ = true;
     backup_finished_ = false;
   }
 }
 
 void ProfileSyncService::AddObserver(
     sync_driver::SyncServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 472 matching lines @@
 }
 
 std::string ProfileSyncService::unrecoverable_error_message() const {
   return unrecoverable_error_message_;
 }
 
 tracked_objects::Location ProfileSyncService::unrecoverable_error_location()
     const {
   return unrecoverable_error_location_;
 }