[Sync] Move keystore key handling to SyncEncryptionHandlerImpl

sync/internal_api/sync_manager_impl.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 "sync/internal_api/sync_manager_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 367 matching lines @@
   AddObserver(&debug_info_event_listener_);
 
   database_path_ = database_location.Append(
       syncable::Directory::kSyncDatabaseFilename);
   encryptor_ = encryptor;
   unrecoverable_error_handler_ = unrecoverable_error_handler;
   report_unrecoverable_error_function_ = report_unrecoverable_error_function;
 
   sync_encryption_handler_.reset(new SyncEncryptionHandlerImpl(
       &share_,
-      encryptor));
+      encryptor,
+      restored_key_for_bootstrapping,
+      restored_keystore_key_for_bootstrapping));
   sync_encryption_handler_->AddObserver(this);
   sync_encryption_handler_->AddObserver(&debug_info_event_listener_);
   sync_encryption_handler_->AddObserver(&js_sync_encryption_handler_observer_);
 
   FilePath absolute_db_path(database_path_);
   file_util::AbsolutePath(&absolute_db_path);
   scoped_ptr<syncable::DirectoryBackingStore> backing_store =
       internal_components_factory->BuildDirectoryBackingStore(
           credentials.email, absolute_db_path).Pass();
 
@@ skipping 59 matching lines @@
 
   scheduler_->Start(SyncScheduler::CONFIGURATION_MODE);
 
   initialized_ = true;
 
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
   observing_ip_address_changes_ = true;
 
   UpdateCredentials(credentials);
 
-  // Cryptographer should only be accessed while holding a
-  // transaction.  Grabbing the user share for the transaction
-  // checks the initialization state, so this must come after
-  // |initialized_| is set to true.
-  ReadTransaction trans(FROM_HERE, GetUserShare());
-  trans.GetCryptographer()->Bootstrap(restored_key_for_bootstrapping);
-  trans.GetCryptographer()->BootstrapKeystoreKey(
-      restored_keystore_key_for_bootstrapping);
-
   FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
                     OnInitializationComplete(
                         MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()),
                         true, InitialSyncEndedTypes()));
 }
 
 void SyncManagerImpl::UpdateSessionNameCallback(
     const std::string& chrome_version,
     const std::string& session_name) {
   WriteTransaction trans(FROM_HERE, GetUserShare());
@@ skipping 45 matching lines @@
     PassphraseRequiredReason reason,
     const sync_pb::EncryptedData& pending_keys) {
   // Does nothing.
 }
 
 void SyncManagerImpl::OnPassphraseAccepted() {
   // Does nothing.
 }
 
 void SyncManagerImpl::OnBootstrapTokenUpdated(
-    const std::string& bootstrap_token) {
+    const std::string& bootstrap_token,
+    BootstrapTokenType type) {
   // Does nothing.
 }
 
 void SyncManagerImpl::OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
                                               bool encrypt_everything) {
   allstatus_.SetEncryptedTypes(encrypted_types);
 }
 
 void SyncManagerImpl::OnEncryptionComplete() {
   // Does nothing.
@@ skipping 128 matching lines @@
   invalidator_->UpdateRegisteredIds(handler, ids);
 }
 
 void SyncManagerImpl::UnregisterInvalidationHandler(
     InvalidationHandler* handler) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(initialized_);
   invalidator_->UnregisterHandler(handler);
 }
 
-bool SyncManagerImpl::GetKeystoreKeyBootstrapToken(std::string* token) {
-  ReadTransaction trans(FROM_HERE, GetUserShare());
-  return trans.GetCryptographer()->GetKeystoreKeyBootstrapToken(token);
-}
-
 void SyncManagerImpl::AddObserver(SyncManager::Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_.AddObserver(observer);
 }
 
 void SyncManagerImpl::RemoveObserver(SyncManager::Observer* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 662 matching lines @@
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
 int SyncManagerImpl::GetPreferencesNudgeDelay() {
   return kPreferencesNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer