Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

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 266 matching lines @@
   content::MockRenderProcessHost* single_rph_;
   content::MockRenderProcessHost* shared_rph_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileState);
 };
 
 }  // namespace
 
 class MediaFileSystemRegistryTest : public ChromeRenderViewHostTestHarness {
  public:
-  MediaFileSystemRegistryTest();
-  virtual ~MediaFileSystemRegistryTest() {}
-
   void CreateProfileState(size_t profile_count);
 
   ProfileState* GetProfileState(size_t i);
 
   base::FilePath empty_dir() {
     return empty_dir_;
   }
 
   base::FilePath dcim_dir() {
     return dcim_dir_;
@@ skipping 49 matching lines @@
     return test_file_system_context_->GetMediaFileSystemRegistry();
   }
 
  protected:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  private:
   // This makes sure that at least one default gallery exists on the file
   // system.
-  EnsureMediaDirectoriesExists media_directories_;
+  scoped_ptr<EnsureMediaDirectoriesExists> media_directories_;
 
   // Some test gallery directories.
-  base::ScopedTempDir galleries_dir_;
+  scoped_ptr<base::ScopedTempDir> galleries_dir_;
   // An empty directory in |galleries_dir_|
   base::FilePath empty_dir_;
   // A directory in |galleries_dir_| with a DCIM directory in it.
   base::FilePath dcim_dir_;
 
   // MediaFileSystemRegistry owns this.
   TestMediaFileSystemContext* test_file_system_context_;
 
   // Needed for extension service & friends to work.
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
-  chromeos::ScopedTestUserManager test_user_manager_;
+  scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 
 // TODO(gbillock): Eliminate windows-specific code from this test.
 #if defined(OS_WIN)
   scoped_ptr<test::TestStorageMonitorWin> monitor_;
 #else
   chrome::test::TestStorageMonitor monitor_;
 #endif
 
-  MockProfileSharedRenderProcessHostFactory rph_factory_;
+  scoped_ptr<MockProfileSharedRenderProcessHostFactory> rph_factory_;
 
   ScopedVector<ProfileState> profile_states_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistryTest);
 };
 
 namespace {
 
 bool MediaFileSystemInfoComparator(const MediaFileSystemInfo& a,
                                    const MediaFileSystemInfo& b) {
   CHECK_NE(a.name, b.name);  // Name must be unique.
   return a.name < b.name;
 }
 
@@ skipping 167 matching lines @@
   num_comparisons_ = 0;
   return result;
 }
 
 }  // namespace
 
 /////////////////////////////////
 // MediaFileSystemRegistryTest //
 /////////////////////////////////
 
-MediaFileSystemRegistryTest::MediaFileSystemRegistryTest()
-    : ui_thread_(content::BrowserThread::UI, MessageLoop::current()),
-      file_thread_(content::BrowserThread::FILE, MessageLoop::current()) {
-}
-
 void MediaFileSystemRegistryTest::CreateProfileState(size_t profile_count) {
   for (size_t i = 0; i < profile_count; ++i) {
-    ProfileState* state = new ProfileState(&rph_factory_);
+    ProfileState* state = new ProfileState(rph_factory_.get());
     profile_states_.push_back(state);
   }
 }
 
 ProfileState* MediaFileSystemRegistryTest::GetProfileState(size_t i) {
   return profile_states_[i];
 }
 
 std::string MediaFileSystemRegistryTest::AddUserGallery(
     StorageInfo::Type type,
@@ skipping 115 matching lines @@
       MediaFileSystemInfo info(path.LossyDisplayName(), path, std::string(),
                                0, std::string(), false, false);
       result.push_back(info);
     }
   }
   std::sort(result.begin(), result.end(), MediaFileSystemInfoComparator);
   return result;
 }
 
 void MediaFileSystemRegistryTest::SetUp() {
+  ChromeRenderViewHostTestHarness::CreateThreadBundle();
+  media_directories_.reset(new EnsureMediaDirectoriesExists());
+  galleries_dir_.reset(new base::ScopedTempDir());
+  rph_factory_.reset(new MockProfileSharedRenderProcessHostFactory());
 #if defined(OS_WIN)
   test::TestPortableDeviceWatcherWin* portable_device_watcher =
       new test::TestPortableDeviceWatcherWin;
   test::TestVolumeMountWatcherWin* mount_watcher =
       new test::TestVolumeMountWatcherWin;
   portable_device_watcher->set_use_dummy_mtp_storage_info(true);
   monitor_.reset(new test::TestStorageMonitorWin(
       mount_watcher, portable_device_watcher));
   monitor_->Init();
   // TODO(gbillock): Replace this with the correct event notification
   // on the storage monitor finishing the startup scan when that exists.
   base::RunLoop().RunUntilIdle();

[Greg Billock, 2013/05/22 00:05:25]

Moved to monitor_->Initialize(run_loop.QuitClosure()) correct?

[awong, 2013/05/22 20:08:36]

Done.

   mount_watcher->FlushWorkerPoolForTesting();
   base::RunLoop().RunUntilIdle();
   mount_watcher->FlushWorkerPoolForTesting();
   base::RunLoop().RunUntilIdle();
 #endif
+  ChromeRenderViewHostTestHarness::SetUp();

[Greg Billock, 2013/05/22 00:05:25]

You moved this up to line 715 right?

[awong, 2013/05/22 20:08:36]

Good point. Fixed.

 
-  ChromeRenderViewHostTestHarness::SetUp();
   DeleteContents();
-  SetRenderProcessHostFactory(&rph_factory_);
+  SetRenderProcessHostFactory(rph_factory_.get());
 
   test_file_system_context_ = new TestMediaFileSystemContext(
       g_browser_process->media_file_system_registry());
 
-  ASSERT_TRUE(galleries_dir_.CreateUniqueTempDir());
-  empty_dir_ = galleries_dir_.path().AppendASCII("empty");
+#if defined OS_CHROMEOS
+  test_user_manager_.reset(new chromeos::ScopedTestUserManager());
+#endif
+
+  ASSERT_TRUE(galleries_dir_->CreateUniqueTempDir());
+  empty_dir_ = galleries_dir_->path().AppendASCII("empty");
   ASSERT_TRUE(file_util::CreateDirectory(empty_dir_));
-  dcim_dir_ = galleries_dir_.path().AppendASCII("with_dcim");
+  dcim_dir_ = galleries_dir_->path().AppendASCII("with_dcim");
   ASSERT_TRUE(file_util::CreateDirectory(dcim_dir_));
   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();
+#if defined OS_CHROMEOS
+  test_user_manager_.reset();
+#endif
+
+#if defined(OS_WIN)
+  monitor_.reset();
+#endif
+  ChromeRenderViewHostTestHarness::TearDown();
 }
 
 ///////////
 // Tests //
 ///////////
 
 TEST_F(MediaFileSystemRegistryTest, Basic) {
   CreateProfileState(1);
   AssertAllAutoAddedGalleries();
 
@@ skipping 196 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