[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc

Index: chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
diff --git a/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc b/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
index a8c82a52dc624eb5ca5e6951cc492e20b79eec9d..d6670d731e5754b8629bca77759a1a7dbe387e06 100644
--- a/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
+++ b/chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/storage_monitor/test_media_transfer_protocol_manager_linux.h"
+#include "chrome/browser/storage_monitor/test_storage_monitor.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -181,7 +182,7 @@ class StorageMonitorLinuxTest : public testing::Test {
                 arraysize(initial_test_data),
                 true  /* overwrite */);
 
-    // Initialize the test subject.
+    test::TestStorageMonitor::RemoveSingleton();
     monitor_.reset(new TestStorageMonitorLinux(mtab_file_, &message_loop_));

[Lei Zhang, 2013/07/03 23:46:18]

We should set the TestBrowserProcess's storage_monitor to the one created here,
and change |monitor_| to a raw pointer, and do
test::TestStorageMonitor::RemoveSingleton() in TearDown() in place of
monitor_.reset();

Otherwise we'll have two StorageMonitors co-existing in this test at some point.

Same pattern exists in StorageMonitor{Win,Mac,ChromeOS}.

[Greg Billock, 2013/07/08 18:50:07]

True. I think all these tests just use the local storage monitor, though, so it
shouldn't matter that the browser process has a separate one. It's probably a
trap for the unwary though... I can see it being confusing... I'll inject it
into the fixture.

     mock_storage_observer_.reset(new MockRemovableStorageObserver);
     monitor_->AddObserver(mock_storage_observer_.get());