[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc

Index: chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc
diff --git a/chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc b/chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc
index f27e10ccc269a0504965bd35c9197c97d3269a85..35deb210dd0a493e33d6bf74b740a9273c5fc2ed 100644
--- a/chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc
+++ b/chrome/browser/storage_monitor/storage_monitor_chromeos_unittest.cc
@@ -16,6 +16,8 @@
 #include "chrome/browser/storage_monitor/removable_device_constants.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/browser/storage_monitor/test_media_transfer_protocol_manager_linux.h"
+#include "chrome/browser/storage_monitor/test_storage_monitor.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/disks/mock_disk_mount_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -135,7 +137,8 @@ class StorageMonitorCrosTest : public testing::Test {
 
   base::MessageLoop ui_loop_;
 
-  scoped_ptr<TestStorageMonitorCros> monitor_;
+  // Pointer to the storage monitor. Owned by TestingBrowserProcess.
+  TestStorageMonitorCros* monitor_;
 
   // Owned by DiskMountManager.
   disks::MockDiskMountManager* disk_mount_manager_mock_;
@@ -176,14 +179,19 @@ void StorageMonitorCrosTest::SetUp() {
   mock_storage_observer_.reset(new chrome::MockRemovableStorageObserver);
 
   // Initialize the test subject.
-  monitor_.reset(new TestStorageMonitorCros());
+  chrome::test::TestStorageMonitor::RemoveSingleton();
+  monitor_ = new TestStorageMonitorCros();
+  TestingBrowserProcess* browser_process = TestingBrowserProcess::GetGlobal();
+  if (browser_process)

[vandebo (ex-Chrome), 2013/07/10 16:57:45]

monitor_ leaks if browser_process is NULL

[Greg Billock, 2013/07/10 21:57:17]

Done.

+    browser_process->SetStorageMonitor(monitor_);
+
   monitor_->Init();
   monitor_->AddObserver(mock_storage_observer_.get());
 }
 
 void StorageMonitorCrosTest::TearDown() {
   monitor_->RemoveObserver(mock_storage_observer_.get());
-  monitor_.reset();
+  monitor_ = NULL;
 
   disk_mount_manager_mock_ = NULL;
   DiskMountManager::Shutdown();