[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/test_storage_monitor.cc

 // Copyright (c) 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 "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"
 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
 #endif
 
 namespace chrome {
 namespace test {
 
 TestStorageMonitor::TestStorageMonitor()
     : StorageMonitor(),
       init_called_(false) {
 #if defined(OS_LINUX)
   media_transfer_protocol_manager_.reset(
       new TestMediaTransferProtocolManagerLinux());
 #endif
 }
 
 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();
   return new TestStorageMonitor();
 }
 
 void TestStorageMonitor::Init() {
   init_called_ = true;
 }
 
@@ skipping 39 matching lines @@
 
 void TestStorageMonitor::EjectDevice(
     const std::string& device_id,
     base::Callback<void(EjectStatus)> callback) {
   ejected_device_ = device_id;
   callback.Run(EJECT_OK);
 }
 
 }  // namespace test
 }  // namespace chrome