Call bootstrapencryption before sending initialization complete.

chrome/browser/sync/internal_api/sync_manager.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/internal_api/sync_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 769 matching lines @@
 
   bool signed_in = SignIn(credentials);
 
   if (signed_in && scheduler()) {
     scheduler()->Start(
         browser_sync::SyncScheduler::CONFIGURATION_MODE, NULL);
   }
 
   initialized_ = true;
 
+  // The following calls check that initialized_ is true.
+  BootstrapEncryption(restored_key_for_bootstrapping);
+
   // Notify that initialization is complete.
   ObserverList<SyncManager::Observer> temp_obs_list;
   CopyObservers(&temp_obs_list);
   FOR_EACH_OBSERVER(SyncManager::Observer, temp_obs_list,
                     OnInitializationComplete(
                         WeakHandle<JsBackend>(weak_ptr_factory_.GetWeakPtr())));
 
-  // The following calls check that initialized_ is true.
-
-  BootstrapEncryption(restored_key_for_bootstrapping);
-
   sync_notifier_->AddObserver(this);
 
   return signed_in;
 }
 
 void SyncManager::SyncInternal::BootstrapEncryption(
     const std::string& restored_key_for_bootstrapping) {
   // Cryptographer should only be accessed while holding a transaction.
   ReadTransaction trans(FROM_HERE, GetUserShare());
   Cryptographer* cryptographer = trans.GetCryptographer();
@@ skipping 1228 matching lines @@
 
   for (syncable::ModelTypeSet::const_iterator i = types.begin();
        i != types.end(); ++i) {
     if (!lookup->initial_sync_ended_for_type(*i))
       return false;
   }
   return true;
 }
 
 }  // namespace sync_api