chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc - Issue 2066493003: Revert of Sync: Support multiple setup UIs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2066493003: Revert of Sync: Support multiple setup UIs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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/integration/profile_sync_service_harness.cc ('k') | chrome/browser/ui/sync/one_click_signin_sync_starter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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 53682fcca13db196f244bde7210ebe0cd2a95c7c..36642ccd56f82241f6cbff187add5596cedae2eb 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

@@ -153,16 +153,16 @@

// When client 1 hits a passphrase required state, we can infer that

// client 0's passphrase has been committed. to the server.

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

+ GetClient(1)->SetupSync();

ASSERT_TRUE(AwaitPassphraseRequired(GetSyncService(1)));

// Get client 1 out of the passphrase required state.

ASSERT_TRUE(SetDecryptionPassphrase(1, kValidPassphrase));

ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService(1)));

- // We must mark the setup complete now, since we just entered the passphrase

- // and the previous SetupSync() call failed.

- GetClient(1)->FinishSyncSetup();

+ // For some reason, the tests won't pass unless these flags are set.

+ GetSyncService(1)->SetFirstSetupComplete();

+ GetSyncService(1)->SetSetupInProgress(false);

// Move around some passwords to make sure it's all working.

PasswordForm form0 = CreateTestPasswordForm(0);