[Sync] Implement keystore migration support.

sync/test/fake_sync_encryption_handler.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/test/fake_sync_encryption_handler.h"
 
 #include "sync/protocol/nigori_specifics.pb.h"
 #include "sync/syncable/nigori_util.h"
 
 namespace syncer {
 
 FakeSyncEncryptionHandler::FakeSyncEncryptionHandler()
     : encrypted_types_(SensitiveTypes()),
       encrypt_everything_(false),
-      passphrase_state_(IMPLICIT_PASSPHRASE),
+      passphrase_type_(IMPLICIT_PASSPHRASE),
       cryptographer_(&encryptor_) {
 }
 FakeSyncEncryptionHandler::~FakeSyncEncryptionHandler() {}
 
 void FakeSyncEncryptionHandler::Init() {
   // Do nothing.
 }
 
 void FakeSyncEncryptionHandler::ApplyNigoriUpdate(
     const sync_pb::NigoriSpecifics& nigori,
     syncable::BaseTransaction* const trans) {
   if (nigori.encrypt_everything())
     EnableEncryptEverything();
-  if (nigori.using_explicit_passphrase())
-    passphrase_state_ = CUSTOM_PASSPHRASE;
+  if (nigori.keybag_is_frozen())
+    passphrase_type_ = CUSTOM_PASSPHRASE;
 
-  if (cryptographer_.CanDecrypt(nigori.encrypted()))
-    cryptographer_.InstallKeys(nigori.encrypted());
-  else if (nigori.has_encrypted())
-    cryptographer_.SetPendingKeys(nigori.encrypted());
+  // TODO(zea): consider adding fake support for migration.
+  if (cryptographer_.CanDecrypt(nigori.encryption_keybag()))
+    cryptographer_.InstallKeys(nigori.encryption_keybag());
+  else if (nigori.has_encryption_keybag())
+    cryptographer_.SetPendingKeys(nigori.encryption_keybag());
 
   if (cryptographer_.has_pending_keys()) {
     DVLOG(1) << "OnPassPhraseRequired Sent";
     sync_pb::EncryptedData pending_keys = cryptographer_.GetPendingKeys();
     FOR_EACH_OBSERVER(SyncEncryptionHandler::Observer, observers_,
                       OnPassphraseRequired(REASON_DECRYPTION,
                                            pending_keys));
   } else if (!cryptographer_.is_ready()) {
     DVLOG(1) << "OnPassphraseRequired sent because cryptographer is not "
              << "ready";
@@ skipping 40 matching lines @@
 }
 
 void FakeSyncEncryptionHandler::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void FakeSyncEncryptionHandler::SetEncryptionPassphrase(
     const std::string& passphrase,
     bool is_explicit) {
   if (is_explicit)
-    passphrase_state_ = CUSTOM_PASSPHRASE;
+    passphrase_type_ = CUSTOM_PASSPHRASE;
 }
 
 void FakeSyncEncryptionHandler::SetDecryptionPassphrase(
     const std::string& passphrase) {
   // Do nothing.
 }
 
 void FakeSyncEncryptionHandler::EnableEncryptEverything() {
   if (encrypt_everything_)
     return;
   encrypt_everything_ = true;
   encrypted_types_ = ModelTypeSet::All();
   FOR_EACH_OBSERVER(
       Observer, observers_,
       OnEncryptedTypesChanged(encrypted_types_, encrypt_everything_));
 }
 
 bool FakeSyncEncryptionHandler::EncryptEverythingEnabled() const {
   return encrypt_everything_;
 }
 
-PassphraseState FakeSyncEncryptionHandler::GetPassphraseState() const {
-  return passphrase_state_;
+PassphraseType FakeSyncEncryptionHandler::GetPassphraseType() const {
+  return passphrase_type_;
 }
 
 }  // namespace syncer