suppress user/password dialog when re-enabling sync

chrome/browser/sync/glue/sync_backend_host.cc

Index: chrome/browser/sync/glue/sync_backend_host.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index 65910cde3cbaf935f0875470bbe43957a8e7edd6..da59af7d5e8655f301df8b3b170de84165bb520c 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -354,6 +354,10 @@ void SyncBackendHost::Initialize(
                                             profile_,
                                             sync_thread_.message_loop()));
   initialization_state_ = CREATING_SYNC_MANAGER;
+  std::string bootstrap_token = sync_prefs_->GetEncryptionBootstrapToken();
+  if (bootstrap_token.empty())
+    bootstrap_token = sync_prefs_->GetSpareBootstrapToken();
+
   InitCore(DoInitializeOptions(
       sync_thread_.message_loop(),
       registrar_.get(),
@@ -366,7 +370,7 @@ void SyncBackendHost::Initialize(
       &chrome_sync_notification_bridge_,
       &sync_notifier_factory_,
       delete_sync_data_folder,
-      sync_prefs_->GetEncryptionBootstrapToken(),
+      bootstrap_token,
       sync_api::SyncManager::NON_TEST,
       unrecoverable_error_handler,
       report_unrecoverable_error_function));
@@ -920,6 +924,7 @@ void SyncBackendHost::Core::OnPassphraseAccepted() {
 
 void SyncBackendHost::Core::OnBootstrapTokenUpdated(
     const std::string& bootstrap_token) {
+  LOG(WARNING) << "OnBootstrapTokenUpdated : " << bootstrap_token;
   if (!sync_loop_)
     return;
   DCHECK_EQ(MessageLoop::current(), sync_loop_);