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

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

Issue 7477006: Add additional check for required passphrase in SetupSync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 | « no previous file | chrome/test/live_sync/two_client_live_passwords_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_harness.cc
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
index a1c7a3039463b47f5fe3e3c7b57b0186e608872c..44ef947912620356f72220f2f5ce7b58de5ccbd2 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -191,6 +191,13 @@ bool ProfileSyncServiceHarness::SetupSync(
return false;
}
+ // Make sure that initial sync wasn't blocked by a missing passphrase.
+ if (wait_state_ == SET_PASSPHRASE_FAILED) {
+ LOG(ERROR) << "A passphrase is required for decryption. Sync cannot proceed"
+ " until SetPassphrase is called.";
+ return false;
+ }
+
// Indicate to the browser that sync setup is complete.
service()->SetSyncSetupCompleted();
« no previous file with comments | « no previous file | chrome/test/live_sync/two_client_live_passwords_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698