[Sync] Make BackendMigrator not wait for full sync cycles

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2011 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 <stddef.h>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 374 matching lines @@
   backend_->Initialize(
       this,
       WeakHandle<JsEventHandler>(sync_js_controller_.AsWeakPtr()),
       sync_service_url_,
       initial_types,
       credentials,
       delete_sync_data_folder);
 }
 
 void ProfileSyncService::CreateBackend() {
-  backend_.reset(new SyncBackendHost(profile_));
+  backend_.reset(new SyncBackendHost(profile_->GetDebugName(), profile_));
 }
 
 bool ProfileSyncService::IsEncryptedDatatypeEnabled() const {
   if (HasPendingEncryptedTypes())
     return true;
   syncable::ModelTypeSet preferred_types;
   GetPreferredDataTypes(&preferred_types);
   syncable::ModelTypeSet encrypted_types;
   GetEncryptedDataTypes(&encrypted_types);
   syncable::ModelTypeBitSet preferred_types_bitset =
@@ skipping 191 matching lines @@
   unrecoverable_error_location_.reset(
       new tracked_objects::Location(from_here.function_name(),
                                     from_here.file_name(),
                                     from_here.line_number(),
                                     from_here.program_counter()));
 
   // Tell the wizard so it can inform the user only if it is already open.
   wizard_.Step(SyncSetupWizard::FATAL_ERROR);
 
   NotifyObservers();
-  LOG(ERROR) << "Unrecoverable error detected -- ProfileSyncService unusable."
-      << message;
   std::string location;
   from_here.Write(true, true, &location);
-  LOG(ERROR) << location;
+  LOG(ERROR)
+      << "Unrecoverable error detected at " << location
+      << " -- ProfileSyncService unusable: " << message;
 
   // Shut all data types down.
   MessageLoop::current()->PostTask(FROM_HERE,
         scoped_runnable_method_factory_.NewRunnableMethod(
         &ProfileSyncService::Shutdown, true));
 }
 
 void ProfileSyncService::OnBackendInitialized(
     const WeakHandle<JsBackend>& js_backend, bool success) {
   if (!success) {
@@ skipping 598 matching lines @@
                                         &data_type_controllers_));
     registrar_.Add(this,
                    chrome::NOTIFICATION_SYNC_CONFIGURE_START,
                    Source<DataTypeManager>(data_type_manager_.get()));
     registrar_.Add(this,
                    chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
                    Source<DataTypeManager>(data_type_manager_.get()));
 
     // We create the migrator at the same time.
     migrator_.reset(
-        new browser_sync::BackendMigrator(this, data_type_manager_.get()));
+        new browser_sync::BackendMigrator(
+            profile_->GetDebugName(), GetUserShare(),
+            this, data_type_manager_.get()));
   }
 
   syncable::ModelTypeSet types;
   GetPreferredDataTypes(&types);
   if (IsPassphraseRequiredForDecryption()) {
     if (IsEncryptedDatatypeEnabled()) {
       // We need a passphrase still. We don't bother to attempt to configure
       // until we receive an OnPassphraseAccepted (which triggers a configure).
       VLOG(1) << "ProfileSyncService::ConfigureDataTypeManager bailing out "
               << "because a passphrase required";
@@ skipping 48 matching lines @@
 }
 
 void ProfileSyncService::LogUnsyncedItems(int level) const {
   if (backend_.get() && backend_initialized_) {
     return backend_->LogUnsyncedItems(level);
   }
   VLOG(level) << "Unsynced items not printed because backend is not "
               << "initialized";
 }
 
-bool ProfileSyncService::HasPendingBackendMigration() const {
-  return migrator_.get() &&
-      migrator_->state() != browser_sync::BackendMigrator::IDLE;
+browser_sync::BackendMigrator*
+    ProfileSyncService::GetBackendMigratorForTest() {
+  return migrator_.get();
 }
 
 void ProfileSyncService::GetModelSafeRoutingInfo(
     browser_sync::ModelSafeRoutingInfo* out) const {
   if (backend_.get() && backend_initialized_) {
     backend_->GetModelSafeRoutingInfo(out);
   } else {
     NOTREACHED();
   }
 }
@@ skipping 262 matching lines @@
             *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes));
     syncable::ModelTypeSet registered;
     GetRegisteredDataTypes(&registered);
     syncable::ModelTypeBitSet registered_bit_set =
         syncable::ModelTypeBitSetFromSet(registered);
     unacknowledged = registered_bit_set & ~acknowledged;
   }
   return unacknowledged;
 }