chrome/browser/sync/test/integration/two_client_bookmarks_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_bookmarks_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_autofill_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_dictionary_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_bookmarks_sync_test.cc

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

index 0a89c4b8e048ead4d8310923348a4d18605f7f11..1491ff2ac4c68ceea0a0647548c2f4bdf1f484f9 100644

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

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

@@ -1567,7 +1567,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, DisableSync) {

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

ASSERT_TRUE(AddFolder(0, IndexedFolderName(0)) != NULL);

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

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

ASSERT_FALSE(AllModelsMatch());

ASSERT_TRUE(AddFolder(1, IndexedFolderName(1)) != NULL);

@@ -1613,7 +1613,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {

ASSERT_TRUE(AddURL(0, GetBookmarkBarNode(0), 0, L"bar", bar_url) != NULL);

ASSERT_TRUE(AddURL(0, GetOtherNode(0), 0, L"other", other_url) != NULL);

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

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

ASSERT_TRUE(HasNodeWithURL(0, bar_url));

ASSERT_TRUE(HasNodeWithURL(0, other_url));

@@ -1621,7 +1621,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {

ASSERT_FALSE(HasNodeWithURL(1, other_url));

Remove(0, GetBookmarkBarNode(0), 0);

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

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

ASSERT_FALSE(HasNodeWithURL(0, bar_url));

ASSERT_TRUE(HasNodeWithURL(0, other_url));