[Sync] Move keystore key handling to SyncEncryptionHandlerImpl

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 20 matching lines @@
 
 // The different states for the encryption passphrase. These control if and how
 // the user should be prompted for a decryption passphrase.
 enum PassphraseState {
   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
+};
+
 // Sync's encryption handler. Handles tracking encrypted types, ensuring the
 // cryptographer encrypts with the proper key and has the most recent keybag,
 // and keeps the nigori node up to date.
 // Implementations of this class must be assumed to be non-thread-safe. All
 // methods must be invoked on the sync thread.
 class SyncEncryptionHandler {
  public:
   // All Observer methods are done synchronously from within a transaction and
   // on the sync thread.
   class Observer {
@@ skipping 19 matching lines @@
     virtual void OnPassphraseAccepted() = 0;
     // |bootstrap_token| is an opaque base64 encoded representation of the key
     // generated by the current passphrase, and is provided to the observer for
     // persistence purposes and use in a future initialization of sync (e.g.
     // after restart). The boostrap token will always be derived from the most
     // recent GAIA password (for accounts with implicit passphrases), even if
     // the data is still encrypted with an older GAIA password. For accounts
     // with explicit passphrases, it will be the most recently seen custom
     // passphrase.
     virtual void OnBootstrapTokenUpdated(
-        const std::string& bootstrap_token) = 0;
+        const std::string& bootstrap_token,
+        BootstrapTokenType type) = 0;
 
     // Called when the set of encrypted types or the encrypt
     // everything flag has been changed.  Note that encryption isn't
     // complete until the OnEncryptionComplete() notification has been
     // sent (see below).
     //
     // |encrypted_types| will always be a superset of
     // Cryptographer::SensitiveTypes().  If |encrypt_everything| is
     // true, |encrypted_types| will be the set of all known types.
     //
@@ skipping 64 matching lines @@
   // bag of encryption keys in the nigori node.
   virtual PassphraseState GetPassphraseState() const = 0;
 
   // The set of types that are always encrypted.
   static ModelTypeSet SensitiveTypes();
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_SYNC_ENCRYPTION_HANDLER_H_