[Sync] Refactoring of sync integration test checkers to remove boilerplate await methods.

chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/guid.h"
 #include "base/i18n/number_formatting.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/typed_urls_helper.h"
+#include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"
 #include "components/history/core/browser/history_types.h"
 
 using base::ASCIIToUTF16;
 using bookmarks::BookmarkNode;
-using sync_integration_test_util::AwaitCommitActivityCompletion;
 using typed_urls_helper::AddUrlToHistory;
 using typed_urls_helper::AddUrlToHistoryWithTimestamp;
 using typed_urls_helper::AddUrlToHistoryWithTransition;
 using typed_urls_helper::AreVisitsEqual;
 using typed_urls_helper::AreVisitsUnique;
-using typed_urls_helper::AwaitCheckAllProfilesHaveSameURLs;
 using typed_urls_helper::CheckURLRowVectorsAreEqual;
 using typed_urls_helper::DeleteUrlFromHistory;
 using typed_urls_helper::GetTypedUrlsFromClient;
 using typed_urls_helper::GetUrlFromClient;
 using typed_urls_helper::GetVisitsFromClient;
 using typed_urls_helper::RemoveVisitsFromClient;
 
 class TwoClientTypedUrlsSyncTest : public SyncTest {
  public:
   TwoClientTypedUrlsSyncTest() : SyncTest(TWO_CLIENT) {}
@@ skipping 43 matching lines @@
   // Use a randomized URL to prevent test collisions.
   const base::string16 kHistoryUrl = ASCIIToUTF16(base::StringPrintf(
       "http://www.add-history.google.com/%s", base::GenerateGUID().c_str()));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   size_t initial_count = GetTypedUrlsFromClient(0).size();
 
   // Populate one client with a URL, wait for it to sync to the other.
   GURL new_url(kHistoryUrl);
   AddUrlToHistory(0, new_url);
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 
   // Assert that the second client has the correct new URL.
   history::URLRows urls = GetTypedUrlsFromClient(1);
   ASSERT_EQ(initial_count + 1, urls.size());
   ASSERT_EQ(new_url, urls.back().url());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, AddExpired) {
   const base::string16 kHistoryUrl(
       ASCIIToUTF16("http://www.add-one-history.google.com/"));
@@ skipping 67 matching lines @@
   // Use a randomized URL to prevent test collisions.
   const base::string16 kHistoryUrl = ASCIIToUTF16(base::StringPrintf(
       "http://www.add-history.google.com/%s", base::GenerateGUID().c_str()));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   size_t initial_count = GetTypedUrlsFromClient(0).size();
 
   // Populate one client with a URL, wait for it to sync to the other.
   GURL new_url(kHistoryUrl);
   AddUrlToHistory(0, new_url);
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 
   // Assert that the second client has the correct new URL.
   history::URLRows urls = GetTypedUrlsFromClient(1);
   ASSERT_EQ(initial_count + 1, urls.size());
   ASSERT_EQ(new_url, urls.back().url());
 
   // Delete from first client, and wait for them to sync.
   DeleteUrlFromHistory(0, new_url);
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 
   // Assert that it's deleted from the second client.
   ASSERT_EQ(initial_count, GetTypedUrlsFromClient(1).size());
 }
 
 // TCM: 3643277
 IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest,
                        E2E_ENABLED(DisableEnableSync)) {
   const base::string16 kUrl1(ASCIIToUTF16("http://history1.google.com/"));
   const base::string16 kUrl2(ASCIIToUTF16("http://history2.google.com/"));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Disable typed url sync for one client, leave it active for the other.
   GetClient(0)->DisableSyncForDatatype(syncer::TYPED_URLS);
 
   // Add one URL to non-syncing client, add a different URL to the other,
   // wait for sync cycle to complete. No data should be exchanged.
   GURL url1(kUrl1);
   GURL url2(kUrl2);
   AddUrlToHistory(0, url1);
   AddUrlToHistory(1, url2);
-  ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(1)));
+  ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(1)).Wait());
 
   // Make sure that no data was exchanged.
   history::URLRows post_sync_urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, post_sync_urls.size());
   ASSERT_EQ(url1, post_sync_urls[0].url());
   post_sync_urls = GetTypedUrlsFromClient(1);
   ASSERT_EQ(1U, post_sync_urls.size());
   ASSERT_EQ(url2, post_sync_urls[0].url());
 
   // Enable typed url sync, make both URLs are synced to each client.
   GetClient(0)->EnableSyncForDatatype(syncer::TYPED_URLS);
 
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 }
 
 // flaky, see crbug.com/108511
 IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest, DISABLED_AddOneDeleteOther) {
   const base::string16 kHistoryUrl(
       ASCIIToUTF16("http://www.add-one-delete-history.google.com/"));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Populate one client with a URL, should sync to the other.
   GURL new_url(kHistoryUrl);
   AddUrlToHistory(0, new_url);
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, urls.size());
   ASSERT_EQ(new_url, urls[0].url());
 
   // Both clients should have this URL.
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 
   // Now, delete the URL from the second client.
   DeleteUrlFromHistory(1, new_url);
   urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, urls.size());
 
   // Both clients should have this URL removed.
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 }
 
 // flaky, see crbug.com/108511
 IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest,
                        DISABLED_AddOneDeleteOtherAddAgain) {
   const base::string16 kHistoryUrl(
       ASCIIToUTF16("http://www.add-delete-add-history.google.com/"));
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Populate one client with a URL, should sync to the other.
   GURL new_url(kHistoryUrl);
   AddUrlToHistory(0, new_url);
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, urls.size());
   ASSERT_EQ(new_url, urls[0].url());
 
   // Both clients should have this URL.
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 
   // Now, delete the URL from the second client.
   DeleteUrlFromHistory(1, new_url);
   urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, urls.size());
 
   // Both clients should have this URL removed.
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 
   // Add it to the first client again, should succeed (tests that the deletion
   // properly disassociates that URL).
   AddUrlToHistory(0, new_url);
 
   // Both clients should have this URL added again.
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientTypedUrlsSyncTest,
                        MergeTypedWithNonTypedDuringAssociation) {
   ASSERT_TRUE(SetupClients());
   GURL new_url("http://history.com");
   base::Time timestamp = base::Time::Now();
   // Put a non-typed URL in both clients with an identical timestamp.
   // Then add a typed URL to the second client - this test makes sure that
   // we properly merge both sets of visits together to end up with the same
   // set of visits on both ends.
   AddUrlToHistoryWithTimestamp(0, new_url, ui::PAGE_TRANSITION_LINK,
                                history::SOURCE_BROWSED, timestamp);
   AddUrlToHistoryWithTimestamp(1, new_url, ui::PAGE_TRANSITION_LINK,
                                history::SOURCE_BROWSED, timestamp);
   AddUrlToHistoryWithTimestamp(1, new_url, ui::PAGE_TRANSITION_TYPED,
                                history::SOURCE_BROWSED,
                                timestamp + base::TimeDelta::FromSeconds(1));
 
   // Now start up sync - URLs should get merged. Fully sync client 1 first,
   // before syncing client 0, so we have both of client 1's URLs in the sync DB
   // at the time that client 0 does model association.
   ASSERT_TRUE(GetClient(1)->SetupSync()) << "SetupSync() failed";
-  AwaitCommitActivityCompletion(GetSyncService(1));
+  ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(1)).Wait());
   ASSERT_TRUE(GetClient(0)->SetupSync()) << "SetupSync() failed";
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   ASSERT_TRUE(CheckClientsEqual());
   // At this point, we should have no duplicates (total visit count should be
   // 2). We only need to check client 0 since we already verified that both
   // clients are identical above.
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, urls.size());
   ASSERT_EQ(new_url, urls[0].url());
@@ skipping 46 matching lines @@
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Populate one client with a non-typed URL, should not be synced.
   GURL new_url(kHistoryUrl);
   AddUrlToHistoryWithTransition(0, new_url, ui::PAGE_TRANSITION_LINK,
                                 history::SOURCE_BROWSED);
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(0U, urls.size());
 
   // Both clients should have 0 typed URLs.
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
   urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(0U, urls.size());
 
   // Now, add a typed visit to this URL.
   AddUrlToHistory(0, new_url);
 
   // Let sync finish.
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   // Both clients should have this URL as typed and have two visits synced up.
@@ skipping 14 matching lines @@
   const GURL kNonTypedURL("http://link.google.com/");
   const GURL kTypedURL("http://typed.google.com/");
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   AddUrlToHistoryWithTransition(0, kNonTypedURL, ui::PAGE_TRANSITION_LINK,
                                 history::SOURCE_BROWSED);
   AddUrlToHistoryWithTransition(0, kTypedURL, ui::PAGE_TRANSITION_TYPED,
                                 history::SOURCE_BROWSED);
 
   // Modify the non-typed URL. It should not get synced.
   typed_urls_helper::SetPageTitle(0, kNonTypedURL, "Welcome to Non-Typed URL");
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 
   history::VisitVector visits;
   // First client has both visits.
   visits = typed_urls_helper::GetVisitsForURLFromClient(0, kNonTypedURL);
   ASSERT_EQ(1U, visits.size());
   EXPECT_TRUE(ui::PageTransitionCoreTypeIs(visits[0].transition,
                                            ui::PAGE_TRANSITION_LINK));
   visits = typed_urls_helper::GetVisitsForURLFromClient(0, kTypedURL);
   ASSERT_EQ(1U, visits.size());
   EXPECT_TRUE(ui::PageTransitionCoreTypeIs(visits[0].transition,
@@ skipping 25 matching lines @@
   GURL redirected_url(kRedirectedHistoryUrl);
   const ui::PageTransition redirected_transition = ui::PageTransitionFromInt(
       ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_CHAIN_END |
       ui::PAGE_TRANSITION_SERVER_REDIRECT);
   // This address will have a typed_count == 0 because it's a redirection.
   // It should still be synced.
   AddUrlToHistoryWithTransition(0, redirected_url, redirected_transition,
                                 history::SOURCE_BROWSED);
 
   // Both clients should have both URLs.
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
 
   history::VisitVector visits =
       typed_urls_helper::GetVisitsForURLFromClient(0, initial_url);
   ASSERT_EQ(1U, visits.size());
   EXPECT_TRUE(ui::PageTransitionCoreTypeIs(visits[0].transition,
                                            ui::PAGE_TRANSITION_TYPED));
   visits = typed_urls_helper::GetVisitsForURLFromClient(0, redirected_url);
   ASSERT_EQ(1U, visits.size());
   EXPECT_TRUE(ui::PageTransitionCoreTypeIs(visits[0].transition,
                                            ui::PAGE_TRANSITION_TYPED));
@@ skipping 64 matching lines @@
   // A row in the DB for client 1 should have been created as a result of the
   // sync.
   history::URLRow row;
   ASSERT_TRUE(GetUrlFromClient(1, bookmark_url, &row));
 
   // Now, add a typed visit for client 0 to the bookmark URL and sync it over
   // - this should not cause a crash.
   AddUrlToHistory(0, bookmark_url);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
-  ASSERT_TRUE(AwaitCheckAllProfilesHaveSameURLs());
+  ASSERT_TRUE(ProfilesHaveSameURLsChecker().Wait());
   history::URLRows urls = GetTypedUrlsFromClient(0);
   ASSERT_EQ(1U, urls.size());
   ASSERT_EQ(bookmark_url, urls[0].url());
   ASSERT_EQ(1, GetVisitCountForFirstURL(0));
 }