[Sync] Add ability to save/restore Nigori to SyncEncryptionHandlerImpl

sync/internal_api/sync_encryption_handler_impl.h

 // Copyright 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_SYNC_ENCRYPTION_HANDLER_IMPL_H_
 #define SYNC_INTERNAL_API_SYNC_ENCRYPTION_HANDLER_IMPL_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 70 matching lines @@
 
   // Unsafe getters. Use only if sync is not up and running and there is no risk
   // of other threads calling this.
   Cryptographer* GetCryptographerUnsafe();
   ModelTypeSet GetEncryptedTypesUnsafe();
 
   bool MigratedToKeystore();
   base::Time migration_time() const;
   base::Time custom_passphrase_time() const;
 
+  // Restore a saved nigori obtained from OnLocalSetCustomPassphrase.
+  //
+  // Writes the nigori to the Directory and updates the Cryptographer.
+  void RestoreNigori(const SyncEncryptionHandler::NigoriState& nigori_state);
+
  private:
   friend class SyncEncryptionHandlerImplTest;
   FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
                            NigoriEncryptionTypes);
   FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
                            EncryptEverythingExplicit);
   FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
                            EncryptEverythingImplicit);
   FRIEND_TEST_ALL_PREFIXES(SyncEncryptionHandlerImplTest,
                            UnknownSensitiveTypes);
@@ skipping 31 matching lines @@
     // The set of types that require encryption.
     ModelTypeSet encrypted_types;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Vault);
   };
 
   // Iterate over all encrypted types ensuring each entry is properly encrypted.
   void ReEncryptEverything(WriteTransaction* trans);
 
-  // Apply a nigori update. Updates internal and cryptographer state.
+  // Updates internal and cryptographer state.
+  //
+  // Assumes |nigori| is already present in the Sync Directory.
+  //
   // Returns true on success, false if |nigori| was incompatible, and the
   // nigori node must be corrected.
   // Note: must be called from within a transaction.
   bool ApplyNigoriUpdateImpl(const sync_pb::NigoriSpecifics& nigori,
                              syncable::BaseTransaction* const trans);
 
   // Wrapper around WriteEncryptionStateToNigori that creates a new write
   // transaction.
   void RewriteNigori();
 
@@ skipping 101 matching lines @@
       Cryptographer* cryptographer);
 
   // Helper to enable encrypt everything, notifying observers if necessary.
   // Will not perform re-encryption.
   void EnableEncryptEverythingImpl(syncable::BaseTransaction* const trans);
 
   // If an explicit passphrase is in use, returns the time at which it was set
   // (if known). Else return base::Time().
   base::Time GetExplicitPassphraseTime() const;
 
+  // Notify observers when a custom passphrase is set by this device.
+  void NotifyObserversOfLocalCustomPassphrase(WriteTransaction* trans);
+
   base::ThreadChecker thread_checker_;
 
   base::ObserverList<SyncEncryptionHandler::Observer> observers_;
 
   // The current user share (for creating transactions).
   UserShare* user_share_;
 
   // Container for all data that can be accessed from multiple threads. Do not
   // access this object directly. Instead access it via UnlockVault(..) and
   // UnlockVaultMutable(..).
@@ skipping 30 matching lines @@
   base::Time custom_passphrase_time_;
 
   base::WeakPtrFactory<SyncEncryptionHandlerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncEncryptionHandlerImpl);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_INTERNAL_API_PUBLIC_SYNC_ENCRYPTION_HANDLER_IMPL_H_