[Sync] Implement keystore migration support.

sync/internal_api/public/sync_encryption_handler.h

 // 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.
 
 #ifndef SYNC_INTERNAL_API_PUBLIC_SYNC_ENCRYPTION_HANDLER_H_
 #define SYNC_INTERNAL_API_PUBLIC_SYNC_ENCRYPTION_HANDLER_H_
 
 #include <string>
 
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 13 matching lines @@
                                        // passphrase for its first attempt at
                                        // encryption. Happens only during
                                        // migration or upgrade.
   REASON_DECRYPTION = 2,               // The cryptographer requires a
                                        // passphrase for its first attempt at
                                        // decryption.
 };
 
 // The different states for the encryption passphrase. These control if and how
 // the user should be prompted for a decryption passphrase.
-enum PassphraseState {
+enum PassphraseType {
   IMPLICIT_PASSPHRASE = 0,             // GAIA-based passphrase (deprecated).
   KEYSTORE_PASSPHRASE = 1,             // Keystore passphrase.
   FROZEN_IMPLICIT_PASSPHRASE = 2,      // Frozen GAIA passphrase.
   CUSTOM_PASSPHRASE = 3,               // User-provided passphrase.
 };
 
 // Enum used to distinguish which bootstrap encryption token is being updated.
 enum BootstrapTokenType {
   PASSPHRASE_BOOTSTRAP_TOKEN,
   KEYSTORE_BOOTSTRAP_TOKEN
@@ skipping 60 matching lines @@
     // Called after we finish encrypting the current set of encrypted
     // types.
     virtual void OnEncryptionComplete() = 0;
 
     // The cryptographer has been updated. Listeners should check that their
     // own state matches the cryptographer.
     // Used primarily for debugging.
     virtual void OnCryptographerStateChanged(Cryptographer* cryptographer) = 0;
 
     // The passprhase state has changed.
-    virtual void OnPassphraseStateChanged(PassphraseState state) = 0;
+    virtual void OnPassphraseTypeChanged(PassphraseType type) = 0;
 
    protected:
     virtual ~Observer();
   };
 
   SyncEncryptionHandler();
   virtual ~SyncEncryptionHandler();
 
   // Add/Remove SyncEncryptionHandler::Observers.
   virtual void AddObserver(Observer* observer) = 0;
@@ skipping 27 matching lines @@
 
   // Enables encryption of all datatypes.
   virtual void EnableEncryptEverything() = 0;
 
   // Whether encryption of all datatypes is enabled. If false, only sensitive
   // types are encrypted.
   virtual bool EncryptEverythingEnabled() const = 0;
 
   // Returns the current state of the passphrase needed to decrypt the
   // bag of encryption keys in the nigori node.
-  virtual PassphraseState GetPassphraseState() const = 0;
+  virtual PassphraseType GetPassphraseType() const = 0;
 
   // The set of types that are always encrypted.
   static ModelTypeSet SensitiveTypes();
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_SYNC_ENCRYPTION_HANDLER_H_