Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(361)

Unified Diff: sync/test/fake_sync_encryption_handler.h

Issue 10916036: [Sync] Implement keystore migration support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/protocol/proto_value_conversions.cc ('k') | sync/test/fake_sync_encryption_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/test/fake_sync_encryption_handler.h
diff --git a/sync/test/fake_sync_encryption_handler.h b/sync/test/fake_sync_encryption_handler.h
index 082f607953c487f51ec4c4178fae61d28b47c2c0..ef32744a36b96d397ad4fa24fbd29ee28db6a45a 100644
--- a/sync/test/fake_sync_encryption_handler.h
+++ b/sync/test/fake_sync_encryption_handler.h
@@ -37,7 +37,7 @@ class FakeSyncEncryptionHandler : public SyncEncryptionHandler,
virtual void SetDecryptionPassphrase(const std::string& passphrase) OVERRIDE;
virtual void EnableEncryptEverything() OVERRIDE;
virtual bool EncryptEverythingEnabled() const OVERRIDE;
- virtual PassphraseState GetPassphraseState() const OVERRIDE;
+ virtual PassphraseType GetPassphraseType() const OVERRIDE;
// NigoriHandler implemenation.
virtual void ApplyNigoriUpdate(
@@ -60,7 +60,7 @@ class FakeSyncEncryptionHandler : public SyncEncryptionHandler,
ObserverList<SyncEncryptionHandler::Observer> observers_;
ModelTypeSet encrypted_types_;
bool encrypt_everything_;
- PassphraseState passphrase_state_;
+ PassphraseType passphrase_type_;
FakeEncryptor encryptor_;
Cryptographer cryptographer_;
« no previous file with comments | « sync/protocol/proto_value_conversions.cc ('k') | sync/test/fake_sync_encryption_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698