Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4016)

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: 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 | « no previous file | chrome/browser/sync/test/integration/migration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
}
« no previous file with comments | « no previous file | chrome/browser/sync/test/integration/migration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698