Reland 89038, but with a mocked out keychain (mac unit tests were timing out)

chrome/browser/sync/glue/sync_backend_host.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 "build/build_config.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 961 matching lines @@
 void SyncBackendHost::Core::HandleInitalizationCompletedOnFrontendLoop() {
   if (!host_)
     return;
   host_->HandleInitializationCompletedOnFrontendLoop();
 }
 
 void SyncBackendHost::HandleInitializationCompletedOnFrontendLoop() {
   if (!frontend_)
     return;
   syncapi_initialized_ = true;
+  // Now that the syncapi is initialized, we can update the cryptographer (and
+  // can handle any ON_PASSPHRASE_REQUIRED notifications that may arise).
+  core_->syncapi()->RefreshEncryption();
   frontend_->OnBackendInitialized();
 }
 
 bool SyncBackendHost::Core::IsCurrentThreadSafeForModel(
     syncable::ModelType model_type) {
   base::AutoLock lock(host_->registrar_lock_);
 
   browser_sync::ModelSafeRoutingInfo::const_iterator routing_it =
       host_->registrar_.routing_info.find(model_type);
   if (routing_it == host_->registrar_.routing_info.end())
@@ skipping 209 matching lines @@
   DCHECK_EQ(MessageLoop::current(), host_->sync_thread_.message_loop());
   syncapi_->GetJsBackend()->ProcessMessage(name, args, sender);
 }
 
 void SyncBackendHost::Core::DeferNudgeForCleanup() {
   DCHECK_EQ(MessageLoop::current(), host_->sync_thread_.message_loop());
   deferred_nudge_for_cleanup_requested_ = true;
 }
 
 }  // namespace browser_sync