[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc

Index: chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
diff --git a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
index eb145bc511b443467d434729235305b128ad8d53..5e1aec85c1526054008e3cf8905bda1b26b81839 100644
--- a/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
+++ b/chrome/browser/storage_monitor/media_transfer_protocol_device_observer_linux_unittest.cc
@@ -12,10 +12,12 @@
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/storage_monitor/mock_removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/storage_info.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/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -92,13 +94,18 @@ class MediaTransferProtocolDeviceObserverLinuxTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     mock_storage_observer_.reset(new MockRemovableStorageObserver);
+    chrome::test::TestStorageMonitor::RemoveSingleton();
+    chrome::test::TestStorageMonitor* monitor =
+        new chrome::test::TestStorageMonitor;
+    TestingBrowserProcess::GetGlobal()->SetStorageMonitor(monitor);
     mtp_device_observer_.reset(
-        new TestMediaTransferProtocolDeviceObserverLinux(monitor_.receiver()));
-    monitor_.AddObserver(mock_storage_observer_.get());
+        new TestMediaTransferProtocolDeviceObserverLinux(monitor->receiver()));
+    monitor->AddObserver(mock_storage_observer_.get());
   }
 
   virtual void TearDown() OVERRIDE {
-    monitor_.RemoveObserver(mock_storage_observer_.get());
+    StorageMonitor* monitor = g_browser_process->storage_monitor();
+    monitor->RemoveObserver(mock_storage_observer_.get());
     mtp_device_observer_.reset();
   }
 
@@ -115,7 +122,6 @@ class MediaTransferProtocolDeviceObserverLinuxTest : public testing::Test {
   base::MessageLoop message_loop_;
   content::TestBrowserThread file_thread_;
 
-  chrome::test::TestStorageMonitor monitor_;
   scoped_ptr<TestMediaTransferProtocolDeviceObserverLinux> mtp_device_observer_;
   scoped_ptr<MockRemovableStorageObserver> mock_storage_observer_;