[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/media_storage_util_unittest.cc

Index: chrome/browser/storage_monitor/media_storage_util_unittest.cc
diff --git a/chrome/browser/storage_monitor/media_storage_util_unittest.cc b/chrome/browser/storage_monitor/media_storage_util_unittest.cc
index b16f93e5773bcda51d5c2e864b7d8fc466b17431..b7d133e0b41e3e2859cf9ec58ba4a90931cd0df2 100644
--- a/chrome/browser/storage_monitor/media_storage_util_unittest.cc
+++ b/chrome/browser/storage_monitor/media_storage_util_unittest.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/storage_monitor/removable_device_constants.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -47,7 +48,7 @@ class MediaStorageUtilTest : public testing::Test {
                      const string16& name,
                      const base::FilePath::StringType& location) {
     StorageInfo info(id, name, location, string16(), string16(), string16(), 0);
-    monitor_.receiver()->ProcessAttach(info);
+    monitor_->receiver()->ProcessAttach(info);
   }
 
  protected:
@@ -62,11 +63,15 @@ class MediaStorageUtilTest : public testing::Test {
   }
 
   virtual void SetUp() OVERRIDE {
+    chrome::test::TestStorageMonitor::RemoveSingleton();
+    monitor_ = new chrome::test::TestStorageMonitor;
+    TestingBrowserProcess::GetGlobal()->SetStorageMonitor(monitor_);
+
     ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
     file_thread_.Start();
   }
 
-  virtual void TearDown() {
+  virtual void TearDown() OVERRIDE {
     WaitForFileThread();
   }
 
@@ -86,7 +91,8 @@ class MediaStorageUtilTest : public testing::Test {
   base::MessageLoop message_loop_;
 
  private:
-  chrome::test::TestStorageMonitor monitor_;
+  // Weak pointer to TestingBrowserProcess-owned storage monitor.
+  chrome::test::TestStorageMonitor* monitor_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   base::ScopedTempDir scoped_temp_dir_;