[sync] Eliminate Await*SyncCompletion methods in integration tests

chrome/browser/sync/test/integration/single_client_bookmarks_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 "chrome/browser/profiles/profile.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_test.h"
 #include "ui/base/layout.h"
 
@@ skipping 38 matching lines @@
       0, tier1_a, 0, L"tier1_a_url0", GURL("http://mail.google.com"));
   const BookmarkNode* tier1_a_url1 = AddURL(
       0, tier1_a, 1, L"tier1_a_url1", GURL("http://www.pandora.com"));
   const BookmarkNode* tier1_a_url2 = AddURL(
       0, tier1_a, 2, L"tier1_a_url2", GURL("http://www.facebook.com"));
   const BookmarkNode* tier1_b_url0 = AddURL(
       0, tier1_b, 0, L"tier1_b_url0", GURL("http://www.nhl.com"));
 
   // Setup sync, wait for its completion, and make sure changes were synced.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   //  Ultimately we want to end up with the following model; but this test is
   //  more about the journey than the destination.
   //
   //  bookmark_bar
   //    -> CNN (www.cnn.com)
   //    -> tier1_a
   //      -> tier1_a_url2 (www.facebook.com)
   //      -> tier1_a_url1 (www.pandora.com)
@@ skipping 10 matching lines @@
   //            -> Toronto Maple Leafs (mapleleafs.nhl.com)
   //            -> Wynn (www.wynnlasvegas.com)
   //      -> tier1_a_url0
   const BookmarkNode* bar = GetBookmarkBarNode(0);
   const BookmarkNode* cnn = AddURL(0, bar, 0, L"CNN",
       GURL("http://www.cnn.com"));
   ASSERT_TRUE(cnn != NULL);
   Move(0, tier1_a, bar, 1);
 
   // Wait for the bookmark position change to sync.
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   const BookmarkNode* porsche = AddURL(0, bar, 2, L"Porsche",
       GURL("http://www.porsche.com"));
   // Rearrange stuff in tier1_a.
   ASSERT_EQ(tier1_a, tier1_a_url2->parent());
   ASSERT_EQ(tier1_a, tier1_a_url1->parent());
   Move(0, tier1_a_url2, tier1_a, 0);
   Move(0, tier1_a_url1, tier1_a, 2);
 
   // Wait for the rearranged hierarchy to sync.
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   ASSERT_EQ(1, tier1_a_url0->parent()->GetIndexOf(tier1_a_url0));
   Move(0, tier1_a_url0, bar, bar->child_count());
   const BookmarkNode* boa = AddURL(0, bar, bar->child_count(),
       L"Bank of America", GURL("https://www.bankofamerica.com"));
   ASSERT_TRUE(boa != NULL);
   Move(0, tier1_a_url0, top, top->child_count());
   const BookmarkNode* bubble = AddURL(
       0, bar, bar->child_count(), L"Seattle Bubble",
           GURL("http://seattlebubble.com"));
   ASSERT_TRUE(bubble != NULL);
   const BookmarkNode* wired = AddURL(0, bar, 2, L"Wired News",
       GURL("http://www.wired.com"));
   const BookmarkNode* tier2_b = AddFolder(
       0, tier1_b, 0, L"tier2_b");
   Move(0, tier1_b_url0, tier2_b, 0);
   Move(0, porsche, bar, 0);
   SetTitle(0, wired, L"News Wired");
   SetTitle(0, porsche, L"ICanHazPorsche?");
 
   // Wait for the title change to sync.
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   ASSERT_EQ(tier1_a_url0->id(), top->GetChild(top->child_count() - 1)->id());
   Remove(0, top, top->child_count() - 1);
   Move(0, wired, tier1_b, 0);
   Move(0, porsche, bar, 3);
   const BookmarkNode* tier3_b = AddFolder(0, tier2_b, 1, L"tier3_b");
   const BookmarkNode* leafs = AddURL(
       0, tier1_a, 0, L"Toronto Maple Leafs", GURL("http://mapleleafs.nhl.com"));
   const BookmarkNode* wynn = AddURL(0, bar, 1, L"Wynn",
       GURL("http://www.wynnlasvegas.com"));
 
   Move(0, wynn, tier3_b, 0);
   Move(0, leafs, tier3_b, 0);
 
   // Wait for newly added bookmarks to sync.
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   ASSERT_TRUE(ModelMatchesVerifier(0));
 }
 
 // Test that a client doesn't mutate the favicon data in the process
 // of storing the favicon data from sync to the database or in the process
 // of requesting data from the database for sync.
 IN_PROC_BROWSER_TEST_F(SingleClientBookmarksSyncTest,
                        SetFaviconHiDPIDifferentCodec) {
   // Set the supported scale factors to 1x and 2x such that
   // BookmarkModel::GetFavicon() requests both 1x and 2x.
@@ skipping 13 matching lines @@
   // Simulate receiving a favicon from sync encoded by a different PNG encoder
   // than the one native to the OS. This tests the PNG data is not decoded to
   // SkBitmap (or any other image format) then encoded back to PNG on the path
   // between sync and the database.
   gfx::Image original_favicon = Create1xFaviconFromPNGFile(
       "favicon_cocoa_png_codec.png");
   ASSERT_FALSE(original_favicon.IsEmpty());
   SetFavicon(0, bookmark, icon_url, original_favicon,
              bookmarks_helper::FROM_SYNC);
 
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   scoped_refptr<base::RefCountedMemory> original_favicon_bytes =
       original_favicon.As1xPNGBytes();
   gfx::Image final_favicon = GetBookmarkModel(0)->GetFavicon(bookmark);
   scoped_refptr<base::RefCountedMemory> final_favicon_bytes =
       final_favicon.As1xPNGBytes();
 
   // Check that the data was not mutated from the original.
   EXPECT_TRUE(original_favicon_bytes.get());
@@ skipping 29 matching lines @@
 
   ASSERT_TRUE(AddFolder(0, GetBookmarkBarNode(0), 0, L"empty_folder"));
   const BookmarkNode* folder1 =
       AddFolder(0, GetBookmarkBarNode(0), 1, L"folder1");
   ASSERT_TRUE(AddURL(0, folder1, 0, L"Yahoo", GURL("http://www.yahoo.com")));
   ASSERT_TRUE(
       AddURL(0, GetBookmarkBarNode(0), 2, L"Gmail", GURL("http://gmail.com")));
 
   // Set up sync, wait for its completion and verify that changes propagated.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   // Remove all bookmarks and wait for sync completion.
   RemoveAll(0);
-  ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+  ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   // Verify other node has no children now.
   EXPECT_EQ(0, GetOtherNode(0)->child_count());
   EXPECT_EQ(0, GetBookmarkBarNode(0)->child_count());
   // Verify model matches verifier.
   ASSERT_TRUE(ModelMatchesVerifier(0));
 }