Add integraton test for sync backup/rollback.

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 <set>
 #include <utility>
@@ skipping 164 matching lines @@
     ProfileSyncServiceStartBehavior start_behavior)
     : OAuth2TokenService::Consumer("sync"),
       last_auth_error_(AuthError::AuthErrorNone()),
       passphrase_required_reason_(syncer::REASON_PASSPHRASE_NOT_REQUIRED),
       factory_(factory),
       profile_(profile),
       sync_prefs_(profile_->GetPrefs()),
       sync_service_url_(kDevServerUrl),
       is_first_time_sync_configure_(false),
       backend_initialized_(false),
+      is_syncing_(false),
       sync_disabled_by_admin_(false),
       is_auth_in_progress_(false),
       signin_(signin_wrapper),
       unrecoverable_error_reason_(ERROR_REASON_UNSET),
       expect_sync_configuration_aborted_(false),
       encrypted_types_(syncer::SyncEncryptionHandler::SensitiveTypes()),
       encrypt_everything_(false),
       encryption_pending_(false),
       configure_status_(DataTypeManager::UNKNOWN),
       oauth2_token_service_(oauth2_token_service),
@@ skipping 141 matching lines @@
   // kSyncKeepEverythingSynced was not properly set. Set it and the preferred
   // types now, before we configure.
   UMA_HISTOGRAM_COUNTS("Sync.DatatypePrefRecovery", 1);
   sync_prefs_.SetKeepEverythingSynced(true);
   syncer::ModelTypeSet registered_types = GetRegisteredDataTypes();
   sync_prefs_.SetPreferredDataTypes(registered_types,
                                     registered_types);
 }
 
 void ProfileSyncService::StartSyncingWithServer() {
-  if (backend_)
+  if (backend_) {
+    is_syncing_ = true;
     backend_->StartSyncingWithServer();
+  }
 }
 
 void ProfileSyncService::RegisterAuthNotifications() {
   oauth2_token_service_->AddObserver(this);
   if (signin())
     signin()->AddObserver(this);
 }
 
 void ProfileSyncService::UnregisterAuthNotifications() {
   if (signin())
@@ skipping 462 matching lines @@
   weak_factory_.InvalidateWeakPtrs();
 
   if (backend_mode_ == SYNC)
     startup_controller_.Reset(GetRegisteredDataTypes());
 
   // Clear various flags.
   backend_mode_ = IDLE;
   expect_sync_configuration_aborted_ = false;
   is_auth_in_progress_ = false;
   backend_initialized_ = false;
+  is_syncing_ = false;
   cached_passphrase_.clear();
   access_token_.clear();
   encryption_pending_ = false;
   encrypt_everything_ = false;
   encrypted_types_ = syncer::SyncEncryptionHandler::SensitiveTypes();
   passphrase_required_reason_ = syncer::REASON_PASSPHRASE_NOT_REQUIRED;
   request_access_token_retry_timer_.Stop();
   // Revert to "no auth error".
   if (last_auth_error_.state() != GoogleServiceAuthError::NONE)
     UpdateAuthErrorState(GoogleServiceAuthError::AuthErrorNone());
@@ skipping 1040 matching lines @@
       // previous configuration left off).
       // TODO(sync): consider detecting configuration recovery and setting
       // the reason here appropriately.
       reason = syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE;
     } else {
       // The user initiated a reconfiguration (either to add or remove types).
       reason = syncer::CONFIGURE_REASON_RECONFIGURATION;
     }
   }
 
+  is_syncing_ = false;
   directory_data_type_manager_->Configure(types, reason);
 }
 
 syncer::UserShare* ProfileSyncService::GetUserShare() const {
   if (backend_.get() && backend_initialized_) {
     return backend_->GetUserShare();
   }
   NOTREACHED();
   return NULL;
 }
@@ skipping 568 matching lines @@
   network_resources_ = network_resources.Pass();
 }
 
 bool ProfileSyncService::HasSyncingBackend() const {
   return backend_mode_ != SYNC ? false : backend_ != NULL;
 }
 
 void ProfileSyncService::SetBackupStartDelayForTest(base::TimeDelta delay) {
   backup_start_delay_ = delay;
 }