summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/profile_sync_service_harness.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_harness.cc')
-rw-r--r--chrome/browser/sync/profile_sync_service_harness.cc11
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
index e675efb..b2b251e 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -272,13 +272,6 @@ bool ProfileSyncServiceHarness::RunStateChangeMachine() {
SignalStateCompleteWithNextState(FULLY_SYNCED);
break;
}
- if (service()->passphrase_required_reason() ==
- sync_api::REASON_SET_PASSPHRASE_FAILED) {
- // A passphrase is required for decryption and we don't have it. Do not
- // wait any more.
- SignalStateCompleteWithNextState(SET_PASSPHRASE_FAILED);
- break;
- }
if (!GetStatus().server_reachable) {
// The client cannot reach the sync server because the network is
// disabled. There is no need to wait anymore.
@@ -771,9 +764,7 @@ bool ProfileSyncServiceHarness::IsDataSyncedImpl(
GetStatus().notifications_enabled &&
!service()->HasUnsyncedItems() &&
!snap->has_more_to_sync &&
- !HasPendingBackendMigration() &&
- service()->passphrase_required_reason() !=
- sync_api::REASON_SET_PASSPHRASE_FAILED;
+ !HasPendingBackendMigration();
}
bool ProfileSyncServiceHarness::IsDataSynced() {