[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor_unittest.cc

Index: chrome/browser/storage_monitor/storage_monitor_unittest.cc
diff --git a/chrome/browser/storage_monitor/storage_monitor_unittest.cc b/chrome/browser/storage_monitor/storage_monitor_unittest.cc
index 9be3a508d434b5a9dd9191358a2efc086af559cf..b0aee9239d2cc3aa87f9a52aad6196eb0d712aa6 100644
--- a/chrome/browser/storage_monitor/storage_monitor_unittest.cc
+++ b/chrome/browser/storage_monitor/storage_monitor_unittest.cc
@@ -13,6 +13,7 @@
 namespace chrome {
 
 TEST(StorageMonitorTest, TestInitialize) {
+  test::TestStorageMonitor::RemoveSingleton();
   test::TestStorageMonitor monitor;
   EXPECT_FALSE(monitor.init_called_);
 
@@ -32,6 +33,7 @@ TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {
   const std::string kDeviceId2 = "dcim:UUID:FFF0-0002";
   MockRemovableStorageObserver observer1;
   MockRemovableStorageObserver observer2;
+  test::TestStorageMonitor::RemoveSingleton();

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

nit: bump to the top of the test?

[Greg Billock, 2013/07/10 21:11:16]

Done.

   test::TestStorageMonitor monitor;
   monitor.AddObserver(&observer1);
   monitor.AddObserver(&observer2);
@@ -74,6 +76,7 @@ TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {
 
 TEST(StorageMonitorTest, GetAllAvailableStoragesEmpty) {
   base::MessageLoop message_loop;
+  test::TestStorageMonitor::RemoveSingleton();
   test::TestStorageMonitor monitor;
   std::vector<StorageInfo> devices = monitor.GetAllAvailableStorages();
   EXPECT_EQ(0U, devices.size());
@@ -81,6 +84,7 @@ TEST(StorageMonitorTest, GetAllAvailableStoragesEmpty) {
 
 TEST(StorageMonitorTest, GetAllAvailableStorageAttachDetach) {
   base::MessageLoop message_loop;
+  test::TestStorageMonitor::RemoveSingleton();
   test::TestStorageMonitor monitor;
   const std::string kDeviceId1 = "dcim:UUID:FFF0-0042";
   const string16 kDeviceName1 = ASCIIToUTF16("test");