diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_harness.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc | 3 |
2 files changed, 2 insertions, 12 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() { diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc index 7efd308..9b62e2f 100644 --- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -272,7 +272,6 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, ASSERT_FALSE(GetClient(1)->SetupSync()); SetPassphrase(1, kAnotherValidPassphrase); ASSERT_TRUE(GetClient(1)->AwaitPassphraseRequired()); - ASSERT_FALSE(GetClient(1)->AwaitFullSyncCompletion("Initial sync.")); // Add a password on 0 while clients have different passphrases. PasswordForm form0 = CreateTestPasswordForm(0); |