Fix remaining leaks in StorageMonitorLinux.

chrome/browser/media_galleries/media_galleries_preferences_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.
 
 // MediaGalleriesPreferences unit tests.
 
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
@@ skipping 68 matching lines @@
   }
 
   virtual ~MediaGalleriesPreferencesTest() {
     // TestExtensionSystem uses DeleteSoon, so we need to delete the profile
     // and then run the message queue to clean up.
     profile_.reset();
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   virtual void SetUp() OVERRIDE {
+    ASSERT_TRUE(test::TestStorageMonitor::CreateAndInstall());
+
     extensions::TestExtensionSystem* extension_system(
         static_cast<extensions::TestExtensionSystem*>(
             extensions::ExtensionSystem::Get(profile_.get())));
     extension_system->CreateExtensionService(
         CommandLine::ForCurrentProcess(), base::FilePath(), false);
 
     gallery_prefs_.reset(new MediaGalleriesPreferences(profile_.get()));
 
     // Load the default galleries into the expectations.
     const MediaGalleriesPrefInfoMap& known_galleries =
@@ skipping 706 matching lines @@
   Verify();
   EXPECT_EQ(1, observer.notifications());
 
   // No gallery for type.
   std::string new_device_id =
       StorageInfo::MakeDeviceId(StorageInfo::PICASA, path.AsUTF8Unsafe());
   EXPECT_FALSE(UpdateDeviceIDForSingletonType(new_device_id));
 }
 
 TEST(MediaGalleryPrefInfoTest, NameGeneration) {
-  test::TestStorageMonitor monitor;
+  ASSERT_TRUE(test::TestStorageMonitor::CreateAndInstall());
 
   MediaGalleryPrefInfo info;
   info.pref_id = 1;
   info.display_name = ASCIIToUTF16("override");
   info.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, "unique");
 
   EXPECT_EQ(ASCIIToUTF16("override"), info.GetGalleryDisplayName());
 
   info.display_name = ASCIIToUTF16("o2");
@@ skipping 21 matching lines @@
   info.volume_label = string16();
   EXPECT_EQ(ASCIIToUTF16("vendor, model"), info.GetGalleryDisplayName());
 
   info.device_id = StorageInfo::MakeDeviceId(
       StorageInfo::FIXED_MASS_STORAGE, "unique");
   EXPECT_EQ(base::FilePath(FILE_PATH_LITERAL("unique")).AsUTF8Unsafe(),
             UTF16ToUTF8(info.GetGalleryTooltip()));
 }
 
 }  // namespace chrome