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(); |