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

chrome/browser/media_galleries/media_file_system_registry_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.
 
 // MediaFileSystemRegistry unit tests.
 
 #include <algorithm>
 #include <set>
 
 #include "base/command_line.h"
@@ skipping 470 matching lines @@
 
 ProfileState::~ProfileState() {
   // TestExtensionSystem uses DeleteSoon, so we need to delete the profiles
   // and then run the message queue to clean up.  But first we have to
   // delete everything that references the profile.
   single_web_contents_.reset();
   shared_web_contents1_.reset();
   shared_web_contents2_.reset();
   profile_.reset();
 
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 }
 
 MediaGalleriesPreferences* ProfileState::GetMediaGalleriesPrefs() {
   return MediaGalleriesPreferencesFactory::GetForProfile(profile_.get());
 }
 
 void ProfileState::CheckGalleries(
     const std::string& test,
     const std::vector<MediaFileSystemInfo>& regular_extension_galleries,
     const std::vector<MediaFileSystemInfo>& all_extension_galleries) {
   content::RenderViewHost* rvh = single_web_contents_->GetRenderViewHost();
   MediaFileSystemRegistry* registry =
       g_browser_process->media_file_system_registry();
 
   // No Media Galleries permissions.
   std::vector<MediaFileSystemInfo> empty_expectation;
   registry->GetMediaFileSystemsForExtension(
       rvh, no_permissions_extension_.get(),
       base::Bind(&ProfileState::CompareResults, base::Unretained(this),
                  base::StringPrintf("%s (no permission)", test.c_str()),
                  base::ConstRef(empty_expectation)));
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1, GetAndClearComparisonCount());
 
   // Read permission only.
   registry->GetMediaFileSystemsForExtension(
       rvh, regular_permission_extension_.get(),
       base::Bind(&ProfileState::CompareResults, base::Unretained(this),
                  base::StringPrintf("%s (regular permission)", test.c_str()),
                  base::ConstRef(regular_extension_galleries)));
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1, GetAndClearComparisonCount());
 
   // All galleries permission.
   registry->GetMediaFileSystemsForExtension(
       rvh, all_permission_extension_.get(),
       base::Bind(&ProfileState::CompareResults, base::Unretained(this),
                  base::StringPrintf("%s (all permission)", test.c_str()),
                  base::ConstRef(all_extension_galleries)));
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(1, GetAndClearComparisonCount());
 }
 
 FSInfoMap ProfileState::GetGalleriesInfo(extensions::Extension* extension) {
   content::RenderViewHost* rvh = single_web_contents_->GetRenderViewHost();
   FSInfoMap results;
   MediaFileSystemRegistry* registry =
       g_browser_process->media_file_system_registry();
   registry->GetMediaFileSystemsForExtension(
       rvh, extension,
       base::Bind(&GetGalleryInfoCallback, base::Unretained(&results)));
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   return results;
 }
 
 extensions::Extension* ProfileState::all_permission_extension() {
   return all_permission_extension_.get();
 }
 
 extensions::Extension* ProfileState::regular_permission_extension() {
   return regular_permission_extension_.get();
 }
@@ skipping 27 matching lines @@
   return result;
 }
 
 }  // namespace
 
 /////////////////////////////////
 // MediaFileSystemRegistryTest //
 /////////////////////////////////
 
 MediaFileSystemRegistryTest::MediaFileSystemRegistryTest()
-    : ui_thread_(content::BrowserThread::UI, MessageLoop::current()),
-      file_thread_(content::BrowserThread::FILE, MessageLoop::current()),
-      permissions_info_(extensions::ChromeAPIPermissions()) {
-}
+    : ui_thread_(content::BrowserThread::UI, base::MessageLoop::current()),
+      file_thread_(content::BrowserThread::FILE, base::MessageLoop::current()),
+      permissions_info_(extensions::ChromeAPIPermissions()) {}
 
 void MediaFileSystemRegistryTest::CreateProfileState(size_t profile_count) {
   for (size_t i = 0; i < profile_count; ++i) {
     ProfileState* state = new ProfileState(&rph_factory_);
     profile_states_.push_back(state);
   }
 }
 
 ProfileState* MediaFileSystemRegistryTest::GetProfileState(size_t i) {
   return profile_states_[i];
@@ skipping 15 matching lines @@
 }
 
 std::string MediaFileSystemRegistryTest::AttachDevice(
     MediaStorageUtil::Type type,
     const std::string& unique_id,
     const base::FilePath& location) {
   std::string device_id = MediaStorageUtil::MakeDeviceId(type, unique_id);
   DCHECK(MediaStorageUtil::IsRemovableDevice(device_id));
   string16 name = location.LossyDisplayName();
   ProcessAttach(device_id, name, location.value());
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   return device_id;
 }
 
 void MediaFileSystemRegistryTest::DetachDevice(const std::string& device_id) {
   DCHECK(MediaStorageUtil::IsRemovableDevice(device_id));
   ProcessDetach(device_id);
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
 }
 
 void MediaFileSystemRegistryTest::SetGalleryPermission(
     ProfileState* profile_state, extensions::Extension* extension,
     const std::string& device_id, bool has_access) {
   MediaGalleriesPreferences* preferences =
       profile_state->GetMediaGalleriesPrefs();
   MediaGalleryPrefIdSet pref_id =
       preferences->LookUpGalleriesByDeviceId(device_id);
   ASSERT_EQ(1U, pref_id.size());
@@ skipping 119 matching lines @@
   ASSERT_TRUE(file_util::CreateDirectory(dcim_dir_.Append(kDCIMDirectoryName)));
 }
 
 void MediaFileSystemRegistryTest::TearDown() {
   profile_states_.clear();
   ChromeRenderViewHostTestHarness::TearDown();
   MediaFileSystemRegistry* registry =
       g_browser_process->media_file_system_registry();
   EXPECT_EQ(0U, registry->GetExtensionGalleriesHostCountForTests());
   BrowserThread::GetBlockingPool()->FlushForTesting();
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   extensions::ManifestHandler::ClearRegistryForTesting();
 }
 
 ///////////
 // Tests //
 ///////////
 
 TEST_F(MediaFileSystemRegistryTest, Basic) {
   CreateProfileState(1);
   AssertAllAutoAddedGalleries();
@@ skipping 81 matching lines @@
       GetMediaFileSystemRegistry()->GetPreferences(profile_state->profile());
   const MediaGalleriesPrefInfoMap& galleries = prefs->known_galleries();
   for (MediaGalleriesPrefInfoMap::const_iterator it = galleries.begin();
        it != galleries.end(); ++it) {
     if (it->second.device_id == device_id) {
       prefs->ForgetGalleryById(it->first);
       forget_gallery = true;
       break;
     }
   }
-  MessageLoop::current()->RunUntilIdle();
+  base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(forget_gallery);
   EXPECT_EQ(gallery_count, GetAutoAddedGalleries(profile_state).size());
 
   // Call GetPreferences() and the gallery count should not change.
   GetMediaFileSystemRegistry()->GetPreferences(profile_state->profile());
   EXPECT_EQ(gallery_count, GetAutoAddedGalleries(profile_state).size());
 }
 
 TEST_F(MediaFileSystemRegistryTest, GalleryNameDefault) {
   FSInfoMap galleries_info;
@@ skipping 97 matching lines @@
   pref_info_with_relpath.device_id = device_id;
   EXPECT_EQ(dcim_dir().Append(pref_info_with_relpath.path).value(),
             pref_info_with_relpath.AbsolutePath().value());
 
   DetachDevice(device_id);
   EXPECT_TRUE(pref_info.AbsolutePath().empty());
   EXPECT_TRUE(pref_info_with_relpath.AbsolutePath().empty());
 }
 
 }  // namespace chrome