[Sync] Move keystore key handling to SyncEncryptionHandlerImpl

sync/engine/download_updates_command.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/engine/download_updates_command.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "sync/engine/syncer.h"
 #include "sync/engine/syncer_proto_util.h"
 #include "sync/internal_api/public/base/model_type_state_map.h"
 #include "sync/syncable/directory.h"
+#include "sync/syncable/nigori_handler.h"
 #include "sync/syncable/read_transaction.h"
-#include "sync/util/cryptographer.h"
 
 using sync_pb::DebugInfo;
 
 namespace syncer {
 using sessions::StatusController;
 using sessions::SyncSession;
 using std::string;
 
 DownloadUpdatesCommand::DownloadUpdatesCommand(
     bool create_mobile_bookmarks_folder)
     : create_mobile_bookmarks_folder_(create_mobile_bookmarks_folder) {}
 
 DownloadUpdatesCommand::~DownloadUpdatesCommand() {}
 
 namespace {
 
 SyncerError HandleGetEncryptionKeyResponse(
     const sync_pb::ClientToServerResponse& update_response,
     syncable::Directory* dir) {
   bool success = false;
   if (!update_response.get_updates().has_encryption_key()) {
     LOG(ERROR) << "Failed to receive encryption key from server.";
     return SERVER_RESPONSE_VALIDATION_FAILED;
   }
   syncable::ReadTransaction trans(FROM_HERE, dir);
-  Cryptographer* cryptographer = dir->GetCryptographer(&trans);
-  success = cryptographer->SetKeystoreKey(
-      update_response.get_updates().encryption_key());
+  syncable::NigoriHandler* nigori_handler = dir->GetNigoriHandler();
+  success = nigori_handler->SetKeystoreKey(
+      update_response.get_updates().encryption_key(),
+      &trans);
 
   DVLOG(1) << "GetUpdates returned encryption key of length "
            << update_response.get_updates().encryption_key().length()
-           << ". Cryptographer keystore key "
+           << ". Nigori keystore key "
            << (success ? "" : "not ") << "updated.";
   return (success ? SYNCER_OK : SERVER_RESPONSE_VALIDATION_FAILED);
 }
 
 }  // namespace
 
 SyncerError DownloadUpdatesCommand::ExecuteImpl(SyncSession* session) {
   sync_pb::ClientToServerMessage client_to_server_message;
   sync_pb::ClientToServerResponse update_response;
 
@@ skipping 26 matching lines @@
         type_state_map.find(it.Get());
     if (type_state != type_state_map.end()) {
       progress_marker->set_notification_hint(type_state->second.payload);
     }
   }
 
   bool need_encryption_key = false;
   if (session->context()->keystore_encryption_enabled()) {
     syncable::Directory* dir = session->context()->directory();
     syncable::ReadTransaction trans(FROM_HERE, dir);
-    Cryptographer* cryptographer =
-        session->context()->directory()->GetCryptographer(&trans);
-    need_encryption_key = !cryptographer->HasKeystoreKey();
+    syncable::NigoriHandler* nigori_handler = dir->GetNigoriHandler();
+    need_encryption_key = nigori_handler->NeedKeystoreKey(&trans);
     get_updates->set_need_encryption_key(need_encryption_key);
 
   }
 
   // We want folders for our associated types, always.  If we were to set
   // this to false, the server would send just the non-container items
   // (e.g. Bookmark URLs but not their containing folders).
   get_updates->set_fetch_folders(true);
 
   // Set GetUpdatesMessage.GetUpdatesCallerInfo information.
@@ skipping 51 matching lines @@
     // could be null in some unit tests.
     if (session->context()->debug_info_getter()) {
       session->context()->debug_info_getter()->GetAndClearDebugInfo(
           debug_info);
     }
     session->mutable_status_controller()->set_debug_info_sent();
   }
 }
 
 }  // namespace syncer