[Sync] Refactor GetEncryptedTypes usage.

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 365 matching lines @@
   SetJsEventHandler(event_handler);
 
   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));
+  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();
 
   DCHECK(backing_store.get());
   share_.name = credentials.email;
   share_.directory.reset(
-      new syncable::Directory(encryptor_,
-                              unrecoverable_error_handler_,
-                              report_unrecoverable_error_function_,
-                              backing_store.release()));
+      new syncable::Directory(
+          backing_store.release(),
+          unrecoverable_error_handler_,
+          report_unrecoverable_error_function_,
+          sync_encryption_handler_.get(),
+          sync_encryption_handler_->cryptographer_unsafe()));
 
   DVLOG(1) << "Username: " << username_for_share();
   if (!OpenDirectory()) {
     FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
                       OnInitializationComplete(
                           MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()),
                           false, syncer::ModelTypeSet()));
     LOG(ERROR) << "Sync manager initialization failed!";
     return;
   }
@@ skipping 49 matching lines @@
 
   // 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);
 
-  sync_encryption_handler_.reset(new SyncEncryptionHandlerImpl(
-      &share_,
-      trans.GetCryptographer()));
-  sync_encryption_handler_->AddObserver(this);
-  sync_encryption_handler_->AddObserver(&debug_info_event_listener_);
-  sync_encryption_handler_->AddObserver(&js_sync_encryption_handler_observer_);
-  trans.GetCryptographer()->SetNigoriHandler(
-      sync_encryption_handler_.get());
-
   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 877 matching lines @@
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
 int SyncManagerImpl::GetPreferencesNudgeDelay() {
   return kPreferencesNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer