chrome/browser/sync/test/integration/cross_platform_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/cross_platform_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: 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:

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

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

index c4ee00ff178a3779aca66eff6d075b2fb29f9e9c..432a90f84f71d08a1c96cebce61abbb8a1b850e9 100644

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

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

@@ -26,6 +26,6 @@ class CrossPlatformSyncTest : public SyncTest {

IN_PROC_BROWSER_TEST_F(CrossPlatformSyncTest, DISABLED_AddBookmark) {

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

ASSERT_TRUE(AddURL(0, L"Google", GURL("http://www.google.co.uk")));

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

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

ASSERT_TRUE(ModelMatchesVerifier(0));

}