Remove MessageLoop::current()->RunUntilIdle() in components.

components/browser_sync/browser/profile_sync_service_bookmark_unittest.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.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 449 matching lines @@
   // Load (or re-load) the bookmark model.  |load| controls use of the
   // bookmarks file on disk.  |save| controls whether the newly loaded
   // bookmark model will write out a bookmark file as it goes.
   void LoadBookmarkModel(LoadOption load, SaveOption save) {
     bool delete_bookmarks = load == DELETE_EXISTING_STORAGE;
     model_.reset();
     model_ = CreateBookmarkModel(delete_bookmarks);
     // This noticeably speeds up the unit tests that request it.
     if (save == DONT_SAVE_TO_STORAGE)
       model_->ClearStore();
-    base::MessageLoop::current()->RunUntilIdle();
+    base::RunLoop().RunUntilIdle();
   }
 
   int GetSyncBookmarkCount() {
     syncer::ReadTransaction trans(FROM_HERE, test_user_share_.user_share());
     syncer::ReadNode node(&trans);
     if (node.InitTypeRoot(syncer::BOOKMARKS) != BaseNode::INIT_OK)
       return 0;
     return node.GetTotalNodeCount();
   }
 
@@ skipping 1958 matching lines @@
       EXPECT_EQ(expected_ver_it->second, it->second);
   }
 }
 
 // Test transaction versions of model and nodes are incremented after changes
 // are applied.
 TEST_F(ProfileSyncServiceBookmarkTestWithData, UpdateTransactionVersion) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   StartSync();
   WriteTestDataToBookmarkModel();
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   BookmarkNodeVersionMap initial_versions;
 
   // Verify transaction versions in sync model and bookmark model (saved as
   // transaction version of root node) are equal after
   // WriteTestDataToBookmarkModel() created bookmarks.
   {
     syncer::ReadTransaction trans(FROM_HERE, test_user_share()->user_share());
     EXPECT_GT(trans.GetModelVersion(syncer::BOOKMARKS), 0);
     GetTransactionVersions(model()->root_node(), &initial_versions);
     EXPECT_EQ(trans.GetModelVersion(syncer::BOOKMARKS),
               initial_versions[model()->root_node()->id()]);
   }
   ExpectTransactionVersionMatch(model()->bookmark_bar_node(),
                                 BookmarkNodeVersionMap());
   ExpectTransactionVersionMatch(model()->other_node(),
                                 BookmarkNodeVersionMap());
   ExpectTransactionVersionMatch(model()->mobile_node(),
                                 BookmarkNodeVersionMap());
 
   // Verify model version is incremented and bookmark node versions remain
   // the same.
   const BookmarkNode* bookmark_bar = model()->bookmark_bar_node();
   model()->Remove(bookmark_bar->GetChild(0));
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   BookmarkNodeVersionMap new_versions;
   GetTransactionVersions(model()->root_node(), &new_versions);
   EXPECT_EQ(initial_versions[model()->root_node()->id()] + 1,
             new_versions[model()->root_node()->id()]);
   ExpectTransactionVersionMatch(model()->bookmark_bar_node(), initial_versions);
   ExpectTransactionVersionMatch(model()->other_node(), initial_versions);
   ExpectTransactionVersionMatch(model()->mobile_node(), initial_versions);
 
   // Verify model version and version of changed bookmark are incremented and
   // versions of others remain same.
   const BookmarkNode* changed_bookmark =
       model()->bookmark_bar_node()->GetChild(0);
   model()->SetTitle(changed_bookmark, base::ASCIIToUTF16("test"));
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
   GetTransactionVersions(model()->root_node(), &new_versions);
   EXPECT_EQ(initial_versions[model()->root_node()->id()] + 2,
             new_versions[model()->root_node()->id()]);
   EXPECT_LT(initial_versions[changed_bookmark->id()],
             new_versions[changed_bookmark->id()]);
   initial_versions.erase(changed_bookmark->id());
   ExpectTransactionVersionMatch(model()->bookmark_bar_node(), initial_versions);
   ExpectTransactionVersionMatch(model()->other_node(), initial_versions);
   ExpectTransactionVersionMatch(model()->mobile_node(), initial_versions);
 }
 
 // Test that sync persistence errors are detected and trigger a failed
 // association.
 TEST_F(ProfileSyncServiceBookmarkTestWithData, PersistenceError) {
   LoadBookmarkModel(DELETE_EXISTING_STORAGE, DONT_SAVE_TO_STORAGE);
   StartSync();
   WriteTestDataToBookmarkModel();
-  base::MessageLoop::current()->RunUntilIdle();
+  base::RunLoop().RunUntilIdle();
 
   BookmarkNodeVersionMap initial_versions;
 
   // Verify transaction versions in sync model and bookmark model (saved as
   // transaction version of root node) are equal after
   // WriteTestDataToBookmarkModel() created bookmarks.
   {
     syncer::ReadTransaction trans(FROM_HERE, test_user_share()->user_share());
     EXPECT_GT(trans.GetModelVersion(syncer::BOOKMARKS), 0);
     GetTransactionVersions(model()->root_node(), &initial_versions);
@@ skipping 68 matching lines @@
   EXPECT_EQ(syncer::kInvalidId, sync_id);
 
   // Verify that Sync ignores deleting this node.
   model()->Remove(node);
   EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount());
 }
 
 }  // namespace
 
 }  // namespace browser_sync