[Sync] Move keystore key handling to SyncEncryptionHandlerImpl

sync/internal_api/sync_encryption_handler_impl.h

Index: sync/internal_api/sync_encryption_handler_impl.h
diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h
index 21d3ab4eeef6f20bbbc36187746038ede07848d8..b326e37169cf4b76c5b6af64669dd963aa43528e 100644
--- a/sync/internal_api/sync_encryption_handler_impl.h
+++ b/sync/internal_api/sync_encryption_handler_impl.h
@@ -71,8 +71,11 @@ class SyncEncryptionHandlerImpl
     : public SyncEncryptionHandler,
       public syncable::NigoriHandler {
  public:
-  SyncEncryptionHandlerImpl(UserShare* user_share,
-                            Encryptor* encryptor);
+  SyncEncryptionHandlerImpl(
+      UserShare* user_share,
+      Encryptor* encryptor,
+      const std::string& restored_key_for_bootstrapping,
+      const std::string& restored_keystore_key_for_bootstrapping);
   virtual ~SyncEncryptionHandlerImpl();
 
   // SyncEncryptionHandler implementation.
@@ -94,6 +97,11 @@ class SyncEncryptionHandlerImpl
   virtual void UpdateNigoriFromEncryptedTypes(
       sync_pb::NigoriSpecifics* nigori,
       syncable::BaseTransaction* const trans) const OVERRIDE;
+  virtual bool NeedKeystoreKey(
+      syncable::BaseTransaction* const trans) const OVERRIDE;
+  virtual bool SetKeystoreKey(
+      const std::string& key,
+      syncable::BaseTransaction* const trans) OVERRIDE;
   // Can be called from any thread.
   virtual ModelTypeSet GetEncryptedTypes(
       syncable::BaseTransaction* const trans) const OVERRIDE;
@@ -194,6 +202,9 @@ class SyncEncryptionHandlerImpl
   // keys stored in the nigori node.
   PassphraseState passphrase_state_;
 
+  // The keystore key provided by the server.
+  std::string keystore_key_;
+
   // The number of times we've automatically (i.e. not via SetPassphrase or
   // conflict resolver) updated the nigori's encryption keys in this chrome
   // instantiation.