Fix some migration-related bugs

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 213 matching lines @@
     if (token_service && token_service->TokensLoadedFromDB() &&
         !AreCredentialsAvailable()) {
       // The token service has lost sync's tokens. We cannot recover from this
       // without signing back in, which is not yet supported. For now, we
       // trigger an unrecoverable error.
       OnUnrecoverableError(FROM_HERE, "Sync credentials lost.");
     }
   }
 }
 
+void ProfileSyncService::StartSyncingWithServer() {
+  if (backend_.get())
+    backend_->StartSyncingWithServer();
+}
+
 void ProfileSyncService::RegisterAuthNotifications() {
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_AVAILABLE,
                  content::Source<TokenService>(token_service));
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_LOADING_FINISHED,
                  content::Source<TokenService>(token_service));
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
@@ skipping 942 matching lines @@
                    chrome::NOTIFICATION_SYNC_CONFIGURE_START,
                    content::Source<DataTypeManager>(data_type_manager_.get()));
     registrar_.Add(this,
                    chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,
                    content::Source<DataTypeManager>(data_type_manager_.get()));
 
     // We create the migrator at the same time.
     migrator_.reset(
         new browser_sync::BackendMigrator(
             profile_->GetDebugName(), GetUserShare(),
-            this, data_type_manager_.get()));
+            this, data_type_manager_.get(),
+            base::Bind(&ProfileSyncService::StartSyncingWithServer,
+                       base::Unretained(this))));
   }
 
   const syncable::ModelTypeSet types = GetPreferredDataTypes();
   if (IsPassphraseRequiredForDecryption()) {
     // We need a passphrase still. We don't bother to attempt to configure
     // until we receive an OnPassphraseAccepted (which triggers a configure).
     DVLOG(1) << "ProfileSyncService::ConfigureDataTypeManager bailing out "
              << "because a passphrase required";
     return;
   }
@@ skipping 243 matching lines @@
       // enabled, and yet we still think we require a passphrase for decryption.
       DCHECK(!(IsPassphraseRequiredForDecryption() &&
                !IsEncryptedDatatypeEnabled()));
 
       // This must be done before we start syncing with the server to avoid
       // sending unencrypted data up on a first time sync.
       if (encryption_pending_)
         backend_->EnableEncryptEverything();
       NotifyObservers();
 
-      // In the old world, this would be a no-op.  With new syncer thread,
-      // this is the point where it is safe to switch from config-mode to
-      // normal operation.
-      backend_->StartSyncingWithServer();
+      if (migrator_.get() &&
+          migrator_->state() != browser_sync::BackendMigrator::IDLE) {
+        // Migration in progress.  Let the migrator know we just finished
+        // configuring something.  It will be up to the migrator to call
+        // StartSyncingWithServer() if migration is now finished.
+        migrator_->OnConfigureDone(*result);
+      } else {
+        StartSyncingWithServer();
+      }
 
       break;
     }
     case chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL: {
       const GoogleServiceSigninSuccessDetails* successful =
           content::Details<const GoogleServiceSigninSuccessDetails>(
               details).ptr();
       DCHECK(!successful->password.empty());
       if (!sync_prefs_.IsStartSuppressed()) {
         cached_passphrase_ = successful->password;
@@ skipping 169 matching lines @@
   // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefined-behaviour-after-directly-calling-the-destru.
   ProfileSyncService* old_this = this;
   this->~ProfileSyncService();
   new(old_this) ProfileSyncService(
       new ProfileSyncComponentsFactoryImpl(profile,
                                            CommandLine::ForCurrentProcess()),
       profile,
       signin,
       behavior);
 }