Fix some migration-related bugs

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_
 #pragma once
 
 #include <list>
 #include <string>
@@ skipping 278 matching lines @@
   // takes place, and the backend isn't initialized yet?
   virtual bool sync_initialized() const;
   virtual bool unrecoverable_error_detected() const;
   const std::string& unrecoverable_error_message() {
     return unrecoverable_error_message_;
   }
   tracked_objects::Location unrecoverable_error_location() {
     return unrecoverable_error_location_;
   }
 
+  // Puts the scheduler into NORMAL mode.
+  void StartSyncingWithServer();

[tim (not reviewing), 2012/04/20 22:38:09]

We can't expose this through here. Any old code in chrome/browser should not
concern itself with, or worse,  depend on / tinker with this most fundamental of
actions in sync. Can we hand the BackendMigrator a callback instead?

[rlarocque, 2012/04/20 22:45:08]

I was struggling to find the least bad way to do this.  I never thought of using
a callback as a means of information hiding.  I'll give it a shot.  

+
   // Returns true if OnPassphraseRequired has been called for any reason.
   virtual bool IsPassphraseRequired() const;
 
   // Returns true if OnPassphraseRequired has been called for decryption and
   // we have an encrypted data type enabled.
   virtual bool IsPassphraseRequiredForDecryption() const;
 
   sync_api::PassphraseRequiredReason passphrase_required_reason() const {
     return passphrase_required_reason_;
   }
@@ skipping 434 matching lines @@
   bool setup_in_progress_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const browser_sync::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_