chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc - Issue 7792093: Moved the handling of the initial passphrase into SyncSetupFlow.

Unified Diff: chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc

Issue 7792093: Moved the handling of the initial passphrase into SyncSetupFlow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Painful merge after phajdan's last-minute huge bulk file move. Created 9 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

« no previous file with comments | « chrome/browser/sync/test/live_sync/passwords_helper.cc ('k') | chrome/browser/sync/test/live_sync/two_client_sessions_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc

diff --git a/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc

index 7916fa63a3784f4eaa82f233b06393d75725524b..fd39c854b4364582f844a2434d81599015a610bc 100644

--- a/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc

+++ b/chrome/browser/sync/test/live_sync/two_client_passwords_sync_test.cc

@@ -138,11 +138,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, SetPassphrase) {

#endif

ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

- SetPassphrase(0, kValidPassphrase, true);

+ SetPassphrase(0, kValidPassphrase);

ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());

ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

- SetPassphrase(1, kValidPassphrase, false);

+ SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase."));

}

@@ -157,11 +157,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,

#endif

ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

- SetPassphrase(0, kValidPassphrase, true);

+ SetPassphrase(0, kValidPassphrase);

ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());

ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

- SetPassphrase(1, kValidPassphrase, false);

+ SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

PasswordForm form = CreateTestPasswordForm(0);

@@ -281,12 +281,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,

ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";

ASSERT_TRUE(GetClient(0)->SetupSync());

- SetPassphrase(0, kValidPassphrase, true);

+ SetPassphrase(0, kValidPassphrase);

ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());

ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Initial sync."));

ASSERT_FALSE(GetClient(1)->SetupSync());

- SetPassphrase(1, kValidPassphrase, false);

+ SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Initial sync."));

@@ -309,15 +309,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,

#endif

ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

- SetPassphrase(0, kValidPassphrase, true);

+ SetPassphrase(0, kValidPassphrase);

ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());

ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));

- SetPassphrase(1, kValidPassphrase, false);

+ SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase."));

- SetPassphrase(1, kValidPassphrase, false);

+ SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase again."));

}