[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/test_storage_monitor.cc

Index: chrome/browser/storage_monitor/test_storage_monitor.cc
diff --git a/chrome/browser/storage_monitor/test_storage_monitor.cc b/chrome/browser/storage_monitor/test_storage_monitor.cc
index e28ce2c91529b84667f0ea699928d6c2c454ceb0..beb37556a72cec1ff392ccf6aa3349399ff76396 100644
--- a/chrome/browser/storage_monitor/test_storage_monitor.cc
+++ b/chrome/browser/storage_monitor/test_storage_monitor.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
 
 #include "chrome/browser/storage_monitor/storage_info.h"
+#include "chrome/test/base/testing_browser_process.h"
 
 #if defined(OS_LINUX)
 #include "chrome/browser/storage_monitor/test_media_transfer_protocol_manager_linux.h"
@@ -25,6 +26,13 @@ TestStorageMonitor::TestStorageMonitor()
 
 TestStorageMonitor::~TestStorageMonitor() {}
 
+void TestStorageMonitor::RemoveSingleton() {

[Lei Zhang, 2013/06/27 00:09:38]

Why do we have this and RemoveSingletonForTesting?

[Greg Billock, 2013/06/27 18:25:43]

Getting rid of the StorageMonitor singleton will let us kill the
RemoveSingletonForTesting method, so it is marked for removal. I was going to do
that in a follow-up, since this change is already quite extensive.

+  StorageMonitor::RemoveSingletonForTesting();
+  TestingBrowserProcess* browser_process = TestingBrowserProcess::GetGlobal();
+  if (browser_process)
+    browser_process->SetStorageMonitor(NULL);
+}
+
 TestStorageMonitor*
 TestStorageMonitor::CreateForBrowserTests() {
   StorageMonitor::RemoveSingletonForTesting();