Fixing broken Integration tests.

chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

 // Copyright (c) 2010 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/bookmarks/bookmark_utils.h"
 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"
 #include "base/rand_util.h"
 
 using std::string;
 using std::wstring;
@@ skipping 114 matching lines @@
 
   {
     const BookmarkNode* google_one = GetByUniqueURL(bm0, initial_url);
     const BookmarkNode* google_two = GetByUniqueURL(bm1, initial_url);
     bookmark_utils::ApplyEditsWithNoGroupChange(bm0, bm_bar0,
         BookmarkEditor::EditDetails(google_one), title, second_url);
     bookmark_utils::ApplyEditsWithNoGroupChange(bm1, bm_bar1,
         BookmarkEditor::EditDetails(google_two), title, third_url);
   }
 
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  // Make sure that client2 has pushed all of it's changes as well.
-  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
   BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 
   {
     const BookmarkNode* google_one = bm_bar0->GetChild(0);
     bm0->SetTitle(google_one, L"Google1");
   }
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 }
 
 // Test Scribe ID - 370558.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
     SC_AddFirstFolder) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 
   {
-    // Let's add first bookmark folder to client1
+    // Let's add first bookmark folder to client0
     const BookmarkNode* new_folder_one =
         v->AddGroup(bm0, bm_bar0, 0, L"TestFolder");
     ASSERT_TRUE(new_folder_one != NULL);
   }
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 370559.
@@ skipping 105 matching lines @@
         v->AddURL(bm0, bm_other0, index, title, GURL(url));
     ASSERT_TRUE(nofavicon_bm != NULL);
   }
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 370563.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_AddSeveralBMsAndFolders) {
+    SC_AddSeveralBMsAndFolders) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   const BookmarkNode* bm_other0 = bm0->other_node();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
   // Let's add some GetBookmarkModel(without favicon)
@@ skipping 69 matching lines @@
         L"Google", GURL("http://www.google.com/news"));
     ASSERT_TRUE(google_news_bm != NULL);
   }
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 371817.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_RenameBMName) {
+    SC_RenameBMName) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
     // Add first bookmark
   const BookmarkNode* test_bm1 = v->AddURL(
@@ skipping 91 matching lines @@
 
   // Let's rename newly added bookmark folder
   v->SetTitle(bm0, bm_folder_one, L"New TestFolder");
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 371826.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_RenameBMFolderWithLongHierarchy) {
+    SC_RenameBMFolderWithLongHierarchy) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 
   // Let's add first bookmark folder to under bookmark_bar.
@@ skipping 317 matching lines @@
     v->Remove(bm0, bm_folder_one, 4);
   }
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 
 // Test Scribe ID - 371857.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_DelBMsUnderBMFoldEmptyFolderAfterwards) {
+    SC_DelBMsUnderBMFoldEmptyFolderAfterwards) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
   // Let's add first bookmark folder to client1
   const BookmarkNode* bm_folder_one =
@@ skipping 97 matching lines @@
 
   // Let's delete the first empty bookmark folder
   v->Remove(bm0, bm_bar0, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 371879.
+// TODO(rsimha): This currently fails due to http://crbug.com/50306.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
     FAILS_SC_DelBMFoldWithBMsNonEmptyAccountAfterwards) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   ASSERT_TRUE(bm_bar0 != NULL);
   const BookmarkNode* bm_other0 = bm0->other_node();
   ASSERT_TRUE(bm_other0 != NULL);
@@ skipping 35 matching lines @@
     wstring title(L"Level2 - TestBookmark");
     title.append(IntToWString(index));
     string url("http://www.nofaviconurl");
     url.append(IntToString(index));
     url.append(".com");
     const BookmarkNode* nofavicon_bm = v->AddURL(bm0,
         bm_folder_one, index, title, GURL(url));
     ASSERT_TRUE(nofavicon_bm != NULL);
   }
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  v->ExpectMatch(bm0);
-  v->ExpectMatch(bm1);
+  BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 
   // Let's delete the bookmark folder (bm_folder_one)
   v->Remove(bm0, bm_bar0, 1);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  v->ExpectMatch(bm0);
-  v->ExpectMatch(bm1);
+  BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 }
 
-
 // Test Scribe ID - 371880.
+// TODO(rsimha): This currently fails due to http://crbug.com/50306.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
     FAILS_SC_DelBMFoldWithBMsAndBMFoldsNonEmptyACAfterwards) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   const BookmarkNode* bm_other0 = bm0->other_node();
   ASSERT_TRUE(bm_other0 != NULL);
 
@@ skipping 71 matching lines @@
                 title.append(IntToWString(index));
                 const BookmarkNode* l3_bm_folder =
                     v->AddGroup(bm0, l2_bm_folder, index2, title);
                 ASSERT_TRUE(l3_bm_folder != NULL);
              }
           }  // end inner for loop
         }
      }
     }
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  v->ExpectMatch(bm0);
-  v->ExpectMatch(bm1);
+  BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 
   // Let's delete the bookmark folder (bm_folder_one)
   v->Remove(bm0, bm_bar0, 1);
 
-
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  v->ExpectMatch(bm0);
-  v->ExpectMatch(bm1);
+  BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 }
 
 // Test Scribe ID - 371882.
+// TODO(rsimha): This currently fails due to http://crbug.com/50306.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
     FAILS_SC_DelBMFoldWithParentAndChildrenBMsAndBMFolds) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
@@ skipping 35 matching lines @@
         // Remaining % of time - Add Bookmark folders
         wstring title(L"Test BMFolder - ChildTestBMFolder");
         title.append(IntToWString(index));
         const BookmarkNode* bm_folder =
             v->AddGroup(bm0, test_bm_folder, index, title);
         ASSERT_TRUE(bm_folder != NULL);
     }
   }
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  v->ExpectMatch(bm0);
-  v->ExpectMatch(bm1);
+  BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 
   // Let's delete test_bm_folder
   v->Remove(bm0, parent_bm_folder, 0);
+
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  v->ExpectMatch(bm0);
-  v->ExpectMatch(bm1);
+  BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 }
 
-
 // Test Scribe ID - 371931.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
     SC_ReverseTheOrderOfTwoBMs) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
@@ skipping 95 matching lines @@
     v->Move(bm0, bm_bar0->GetChild(2),
         bm_folder_one, index);
     ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
     v->ExpectMatch(bm0);
     v->ExpectMatch(bm1);
   }
 }
 
 // Test Scribe ID - 371957.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_MovingBMsFromBMFoldToBMBar) {
+    SC_MovingBMsFromBMFoldToBMBar) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   const BookmarkNode* bm_other0 = bm0->other_node();
   ASSERT_TRUE(bm_other0 != NULL);
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
@@ skipping 145 matching lines @@
   v->Move(bm0, bm_h, parent_folder, 0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 
 // Test Scribe ID - 371967.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_HoistBMs10LevelUp) {
+    SC_HoistBMs10LevelUp) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
   const BookmarkNode* bm_folder = bm_bar0;
   const BookmarkNode* bm_folder_L10 = NULL;
@@ skipping 118 matching lines @@
   v->Move(bm0, bm_c, bm_folder_L10, 1);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 
 // Test Scribe ID - 371980.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_SinkEmptyBMFold5LevelsDown) {
+    SC_SinkEmptyBMFold5LevelsDown) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 
   const BookmarkNode* bm_folder = bm_bar0;
@@ skipping 34 matching lines @@
   v->Move(bm0, empty_bm_folder, bm_folder_L5,
       bm_folder_L5->GetChildCount());
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 371997.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_SinkNonEmptyBMFold5LevelsDown) {
+    SC_SinkNonEmptyBMFold5LevelsDown) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
 
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 
   const BookmarkNode* bm_folder = bm_bar0;
@@ skipping 145 matching lines @@
   // Let's change positions of bookmark folders so it is more like ba.
   v->ReverseChildOrder(bm0, bm_bar0);
 
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 372028.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_SC_ReverseTheOrderOfTenBMFolders) {
+    SC_ReverseTheOrderOfTenBMFolders) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 
   // Let's add 10 non-empty bookmark folders like 0123456789
   for (int index = 0; index < 10; index++) {
@@ skipping 37 matching lines @@
     ASSERT_TRUE(bm_foo3 != NULL);
 
     const BookmarkNode* bm_foo2 = bm0->AddURL(
         bm_bar0, 1, L"Foo2", GURL("http://www.foo2.com"));
     ASSERT_TRUE(bm_foo2 != NULL);
     const BookmarkNode* bm_foo4 = bm1->AddURL(
         bm_bar1, 1, L"Foo4", GURL("http://www.foo4.com"));
     ASSERT_TRUE(bm_foo4 != NULL);
   }
 
-
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  // Make sure that client2 has pushed all of it's changes as well.
-  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
   BookmarkModelVerifier::ExpectModelsMatch(bm0, bm1);
 }
 
 // Test Scribe ID - 373506.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_MC_BootStrapEmptyStateEverywhere) {
+    MC_BootStrapEmptyStateEverywhere) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   BookmarkModelVerifier* v = verifier_helper();
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
-
-  // Wait for changes to propagate.
-  ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-  // Let's compare and make sure both bookmark models are same after sync.
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
   v->ExpectMatch(bm0);
   v->ExpectMatch(bm1);
 }
 
 // Test Scribe ID - 373508.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_MC_SimpleMergeOfDifferentBMModels) {
+    MC_SimpleMergeOfDifferentBMModels) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
 
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   const BookmarkNode* bm_bar1 = bm1->GetBookmarkBarNode();
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3; index++) {
     wstring title(L"TestBookmark");
@@ skipping 30 matching lines @@
     url.append(".com");
     const BookmarkNode* nofavicon_bm_client1 =
         bm1->AddURL(bm_bar1, index, title, GURL(url));
     ASSERT_TRUE(nofavicon_bm_client1 != NULL);
   }
 
   // Set up sync on both clients.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Wait for changes to propagate.
-  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
   // Let's make sure there aren't any duplicates after sync.
   BookmarkModelVerifier::VerifyNoDuplicates(bm0);
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       bm0, bm1, false);
 }
 
 // Test Scribe ID - 386586.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_MC_MergeSimpleBMHierarchyUnderBMBar) {
+    MC_MergeSimpleBMHierarchyUnderBMBar) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   ui_test_utils::WaitForBookmarkModelToLoad(bm1);
 
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   const BookmarkNode* bm_bar1 = bm1->GetBookmarkBarNode();
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3 ; index++) {
@@ skipping 19 matching lines @@
     url.append(".com");
     const BookmarkNode* nofavicon_bm_client1 =
         bm1->AddURL(bm_bar1, index, title, GURL(url));
     ASSERT_TRUE(nofavicon_bm_client1 != NULL);
   }
 
   // Set up sync on both clients.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Wait for changes to propagate.
-  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
   // Let's make sure there aren't any duplicates after sync.
   BookmarkModelVerifier::VerifyNoDuplicates(bm0);
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       bm0, bm1, false);
 }
 
 // Test Scribe ID - 386589.
 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
-    FAILS_MC_MergeSimpleBMHierarchyEqualSetsUnderBMBar) {
+    MC_MergeSimpleBMHierarchyEqualSetsUnderBMBar) {
   ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
   BookmarkModel* bm0 = GetBookmarkModel(0);
   BookmarkModel* bm1 = GetBookmarkModel(1);
   ui_test_utils::WaitForBookmarkModelToLoad(bm1);
 
   const BookmarkNode* bm_bar0 = bm0->GetBookmarkBarNode();
   const BookmarkNode* bm_bar1 = bm1->GetBookmarkBarNode();
 
   // Let's add same bookmarks (without favicon) to both clients.
   for (int index = 0; index < 3 ; index++) {
     wstring title(L"TestBookmark");
     title.append(IntToWString(index));
     string url("http://www.nofaviconurl");
     url.append(IntToString(index));
     url.append(".com");
     const BookmarkNode* nofavicon_bm_client0 =
         bm0->AddURL(bm_bar0, index, title, GURL(url));
     ASSERT_TRUE(nofavicon_bm_client0 != NULL);
     const BookmarkNode* nofavicon_bm_client1 =
         bm1->AddURL(bm_bar1, index, title, GURL(url));
     ASSERT_TRUE(nofavicon_bm_client1 != NULL);
   }
 
   // Set up sync on both clients.
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Wait for changes to propagate.
-  ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
+  ASSERT_TRUE(ProfileSyncServiceTestHarness::AwaitQuiescence(clients()));
   // Let's make sure there aren't any duplicates after sync.
   BookmarkModelVerifier::VerifyNoDuplicates(bm0);
   // Let's compare and make sure both bookmark models are same after sync.
   BookmarkModelVerifier::ExpectModelsMatchIncludingFavicon(
       bm0, bm1, false);
 }