chrome: Use base::MessageLoop. (Part 3)

chrome/browser/sync/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 <map>
 #include <queue>
@@ skipping 398 matching lines @@
                   local_merge_result_.num_items_deleted());
     EXPECT_EQ(syncer_merge_result_.num_items_after_association(),
               syncer_merge_result_.num_items_before_association() +
                   syncer_merge_result_.num_items_added() -
                   syncer_merge_result_.num_items_deleted());
     EXPECT_EQ(model_->root_node()->GetTotalNodeCount(),
               local_merge_result_.num_items_after_association());
     EXPECT_EQ(GetSyncBookmarkCount(),
               syncer_merge_result_.num_items_after_association());
 
-    MessageLoop::current()->RunUntilIdle();
+    base::MessageLoop::current()->RunUntilIdle();
 
     // Set up change processor.
     change_processor_.reset(
         new BookmarkChangeProcessor(model_associator_.get(),
                                     &mock_error_handler_));
     change_processor_->Start(&profile_, test_user_share_.user_share());
   }
 
   void StopSync() {
     change_processor_.reset();
@@ skipping 166 matching lines @@
 
  protected:
   BookmarkModel* model_;
   syncer::TestUserShare test_user_share_;
   scoped_ptr<BookmarkChangeProcessor> change_processor_;
   StrictMock<DataTypeErrorHandlerMock> mock_error_handler_;
   scoped_ptr<BookmarkModelAssociator> model_associator_;
 
  private:
   // Used by both |ui_thread_| and |file_thread_|.
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   // Needed by |model_|.
   content::TestBrowserThread file_thread_;
 
   syncer::SyncMergeResult local_merge_result_;
   syncer::SyncMergeResult syncer_merge_result_;
 
   TestingProfile profile_;
 };
 
@@ skipping 1157 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();
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->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, 0);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->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, WideToUTF16Hack(L"test"));
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->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);
 }
 
 }  // namespace
 
 }  // namespace browser_sync