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

Unified Diff: chrome/browser/sync/test/integration/single_client_typed_urls_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/single_client_themes_sync_test.cc ('k') | chrome/browser/sync/test/integration/sync_auth_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c50365827002964a6d2479a9affe4d867610e611..3a8f9cd8c0fcc32b1500103b7cbf7566b7433c4a 100644

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

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

@@ -40,7 +40,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, Sanity) {

AssertAllProfilesHaveSameURLsAsVerifier();

// Wait for sync and verify client did not change.

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

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

AssertAllProfilesHaveSameURLsAsVerifier();

}

@@ -60,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, TwoVisits) {

AssertAllProfilesHaveSameURLsAsVerifier();

// Wait for sync and verify client did not change.

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

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

AssertAllProfilesHaveSameURLsAsVerifier();

}

@@ -80,12 +80,12 @@ IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, DeleteTyped) {

AssertAllProfilesHaveSameURLsAsVerifier();

// Wait for sync and verify client did not change.

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

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

AssertAllProfilesHaveSameURLsAsVerifier();

// Now delete the URL we just added, wait for sync, and verify the deletion.

DeleteUrlFromHistory(0, new_url);

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

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

urls = GetTypedUrlsFromClient(0);

ASSERT_EQ(0U, urls.size());

AssertAllProfilesHaveSameURLsAsVerifier();

@@ -106,12 +106,12 @@ IN_PROC_BROWSER_TEST_F(SingleClientTypedUrlsSyncTest, DeleteNonTyped) {

AssertAllProfilesHaveSameURLsAsVerifier();

// Wait for sync and verify client did not change.

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

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

AssertAllProfilesHaveSameURLsAsVerifier();

// Now delete the URL we just added, wait for sync and verify the deletion.

DeleteUrlFromHistory(0, new_url);

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

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

urls = GetTypedUrlsFromClient(0);

ASSERT_EQ(0U, urls.size());

AssertAllProfilesHaveSameURLsAsVerifier();