Fix remaining leaks in StorageMonitorLinux.

chrome/browser/media_galleries/media_galleries_permissions_unittest.cc

 // Copyright 2013 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_prefs_unittest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
@@ skipping 10 matching lines @@
                           std::vector<MediaGalleryPermission>* vector) {
   MediaGalleryPermission permission;
   permission.pref_id = gallery;
   permission.has_permission = has_access;
   vector->push_back(permission);
 }
 
 }  // namespace
 
 // Test the MediaGalleries permissions functions.
-class MediaGalleriesPermissionsTest
-    : public extensions::ExtensionPrefsTest {
+class MediaGalleriesPermissionsTest : public extensions::ExtensionPrefsTest {
  protected:
-  MediaGalleriesPermissionsTest()
-      : profile_(new TestingProfile),
-        gallery_prefs_(new MediaGalleriesPreferences(profile_.get())) {
-    gallery_prefs_->SetExtensionPrefsForTesting(prefs());
-  }
-
-  virtual ~MediaGalleriesPermissionsTest() {
-  }
+  MediaGalleriesPermissionsTest() {}
+  virtual ~MediaGalleriesPermissionsTest() {}
 
   // This is the same implementation as ExtensionPrefsTest::TearDown(), except
   // for also resetting the ExtensionPrefs used by |gallery_prefs_| after
   // TestExtensionPrefs reconstructs them.
   virtual void TearDown() OVERRIDE {
     Verify();
 
     // Reset ExtensionPrefs, and re-verify.
     prefs_.ResetPrefRegistry();
     RegisterPreferences(prefs_.pref_registry().get());
     prefs_.RecreateExtensionPrefs();
     gallery_prefs_->SetExtensionPrefsForTesting(prefs());
     Verify();
     prefs_.pref_service()->CommitPendingWrite();
     message_loop_.RunUntilIdle();
 
     testing::Test::TearDown();
   }
 
   virtual void Initialize() OVERRIDE {
+    ASSERT_TRUE(test::TestStorageMonitor::CreateAndInstall());
+    profile_.reset(new TestingProfile);
+    gallery_prefs_.reset(new MediaGalleriesPreferences(profile_.get()));
+    gallery_prefs_->SetExtensionPrefsForTesting(prefs());
+
     extension1_id_ = prefs_.AddExtensionAndReturnId("test1");
     extension2_id_ = prefs_.AddExtensionAndReturnId("test2");
     extension3_id_ = prefs_.AddExtensionAndReturnId("test3");
     // Id4 isn't used to ensure that an empty permission list is ok.
     extension4_id_ = prefs_.AddExtensionAndReturnId("test4");
     Verify();
 
     gallery_prefs_->SetGalleryPermissionInPrefs(extension1_id_, 1, false);
     AddGalleryPermission(1, false, &extension1_expectation_);
     Verify();
@@ skipping 57 matching lines @@
   std::string extension1_id_;
   std::string extension2_id_;
   std::string extension3_id_;
   std::string extension4_id_;
 
   std::vector<MediaGalleryPermission> extension1_expectation_;
   std::vector<MediaGalleryPermission> extension2_expectation_;
   std::vector<MediaGalleryPermission> extension3_expectation_;
   std::vector<MediaGalleryPermission> extension4_expectation_;
 
-  test::TestStorageMonitor monitor_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<MediaGalleriesPreferences> gallery_prefs_;
 };
 TEST_F(MediaGalleriesPermissionsTest, MediaGalleries) {}
 
 }  // namespace chrome