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

Unified Diff: chrome/browser/sync/profile_sync_service_password_unittest.cc

Issue 10827266: [Sync] Add SyncEncryptionHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Created 8 years, 4 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
Index: chrome/browser/sync/profile_sync_service_password_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc
index 5597cdb415c0eaab0cdb66706a3577e192eccfe3..275dc0763b1d7dc374bfdc194afb71dfec6aecc0 100644
--- a/chrome/browser/sync/profile_sync_service_password_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc
@@ -99,7 +99,17 @@ class PasswordTestProfileSyncService : public TestProfileSyncService {
virtual ~PasswordTestProfileSyncService() {}
- virtual void OnPassphraseAccepted() {
+ virtual void OnPassphraseRequired(
+ syncer::PassphraseRequiredReason reason,
+ const sync_pb::EncryptedData& pending_keys) OVERRIDE {
+ // We purposely don't let passphrase_required_reason_ get set here, in order
+ // to let the datatype manager get blocked later (at which point we then
+ // set the encryption passphrase).
+ // On a normal client, we would have initialized the cryptographer with the
+ // login credentials.
+ }
+
+ virtual void OnPassphraseAccepted() OVERRIDE {
if (!callback_.is_null())
callback_.Run();
« no previous file with comments | « chrome/browser/sync/profile_sync_service_bookmark_unittest.cc ('k') | sync/engine/apply_updates_command_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698