chrome/browser/sync/test/integration/profile_sync_service_harness.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/profile_sync_service_harness.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.h ('k') | chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

index 756d7ac99081b1f033dacfe9e03dd75adbd405ec..10a03f0b4ee7582602062936cffd83f874b7298e 100644

--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc

@@ -155,7 +155,7 @@

// Tell the sync service that setup is in progress so we don't start syncing

// until we've finished configuration.

- sync_blocker_ = service()->GetSetupInProgressHandle();

+ service()->SetSetupInProgress(true);

DCHECK(!username_.empty());

if (signin_type_ == SigninType::UI_SIGNIN) {

@@ -305,7 +305,7 @@

}

void ProfileSyncServiceHarness::FinishSyncSetup() {

- sync_blocker_.reset();

+ service()->SetSetupInProgress(false);

service()->SetFirstSetupComplete();

}