Fix remaining leaks in StorageMonitorLinux.

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/bind_helpers.h"
@@ skipping 360 matching lines @@
   TestMediaFileSystemContext* test_file_system_context_;
 
   // Needed for extension service & friends to work.
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
   scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 
-  scoped_ptr<chrome::test::TestStorageMonitor> monitor_;
-
   MockProfileSharedRenderProcessHostFactory rph_factory_;
 
   ScopedVector<ProfileState> profile_states_;
 };
 
 namespace {
 
 bool MediaFileSystemInfoComparator(const MediaFileSystemInfo& a,
                                    const MediaFileSystemInfo& b) {
   CHECK_NE(a.name, b.name);  // Name must be unique.
@@ skipping 347 matching lines @@
        it != registry->extension_hosts_map_.end();
        ++it) {
     extension_galleries_host_count += it->second.size();
   }
   return extension_galleries_host_count;
 }
 
 
 void MediaFileSystemRegistryTest::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
-  monitor_.reset(new test::TestStorageMonitor());
-  monitor_->MarkInitialized();
-  base::RunLoop runloop;
-  monitor_->EnsureInitialized(runloop.QuitClosure());
-  runloop.Run();
+  ASSERT_TRUE(test::TestStorageMonitor::CreateAndInstall());
 
   DeleteContents();
   SetRenderProcessHostFactory(&rph_factory_);
 
   test_file_system_context_ = new TestMediaFileSystemContext(
       g_browser_process->media_file_system_registry());
 
 #if defined(OS_CHROMEOS)
   test_user_manager_.reset(new chromeos::ScopedTestUserManager());
 #endif
@@ skipping 265 matching lines @@
     ASSERT_TRUE(PathService::Get(chrome::DIR_USER_VIDEOS, &path));
     profile_state->AddNameForAllCompare(path.BaseName().LossyDisplayName());
 
     profile_state->CheckGalleries("names-dir", one_expectation, auto_galleries);
   } else {
     profile_state->CheckGalleries("names", one_expectation, one_expectation);
   }
 }
 
 }  // namespace chrome