chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc - Issue 148723002: [sync] Eliminate Await*SyncCompletion methods in integration tests

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_preferences_sync_test.cc

Issue 148723002: [sync] Eliminate Await*SyncCompletion methods in integration tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address feedback Created 6 years, 11 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/two_client_passwords_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 10edda2ff1c8492fdb01109a2b762d0d6cfc625b..70dcd662a5edd34dbf06ec0ed909a642c5046953 100644

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

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

@@ -89,7 +89,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisablePreferences) {

GetClient(1)->DisableSyncForDatatype(syncer::PREFERENCES);

ChangeBooleanPref(0, prefs::kPasswordManagerEnabled);

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

+ ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());

ASSERT_FALSE(BooleanPrefMatches(prefs::kPasswordManagerEnabled));

GetClient(1)->EnableSyncForDatatype(syncer::PREFERENCES);

@@ -108,7 +108,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, DisableSync) {

GetClient(1)->DisableSyncForAllDatatypes();

ChangeBooleanPref(0, prefs::kPasswordManagerEnabled);

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

+ ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());

ASSERT_FALSE(BooleanPrefMatches(prefs::kPasswordManagerEnabled));

ChangeBooleanPref(1, prefs::kShowHomeButton);