[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/storage_monitor_unittest.cc

 // Copyright (c) 2012 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 "base/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/storage_monitor/mock_removable_storage_observer.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace {
+
+void SetLatch(bool* called) {
+  *called = true;
+}
+
+}  // namespace
+
 namespace chrome {
 
 TEST(StorageMonitorTest, TestInitialize) {
+  test::TestStorageMonitor::RemoveSingleton();
   test::TestStorageMonitor monitor;
   EXPECT_FALSE(monitor.init_called_);
 
-  base::WaitableEvent event(false, false);
-  monitor.EnsureInitialized(base::Bind(&base::WaitableEvent::Signal,
-                                       base::Unretained(&event)));
+  bool initialized = false;
+  monitor.EnsureInitialized(base::Bind(&SetLatch, &initialized));
   EXPECT_TRUE(monitor.init_called_);
-  EXPECT_FALSE(event.IsSignaled());
+  EXPECT_FALSE(initialized);
   monitor.MarkInitialized();
-  EXPECT_TRUE(event.IsSignaled());
+  EXPECT_TRUE(initialized);
 }
 
 TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {
+  test::TestStorageMonitor::RemoveSingleton();
   base::MessageLoop message_loop;
   const string16 kDeviceName = ASCIIToUTF16("media device");
   const std::string kDeviceId1 = "dcim:UUID:FFF0-0001";
   const std::string kDeviceId2 = "dcim:UUID:FFF0-0002";
   MockRemovableStorageObserver observer1;
   MockRemovableStorageObserver observer2;
   test::TestStorageMonitor monitor;
   monitor.AddObserver(&observer1);
   monitor.AddObserver(&observer2);
 
@@ skipping 27 matching lines @@
 
   // The kDeviceId2 won't be notified since it was never attached.
   EXPECT_EQ(1, observer1.detach_calls());
   EXPECT_EQ(1, observer2.detach_calls());
 
   monitor.RemoveObserver(&observer1);
   monitor.RemoveObserver(&observer2);
 }
 
 TEST(StorageMonitorTest, GetAllAvailableStoragesEmpty) {
+  test::TestStorageMonitor::RemoveSingleton();
   base::MessageLoop message_loop;
   test::TestStorageMonitor monitor;
   std::vector<StorageInfo> devices = monitor.GetAllAvailableStorages();
   EXPECT_EQ(0U, devices.size());
 }
 
 TEST(StorageMonitorTest, GetAllAvailableStorageAttachDetach) {
+  test::TestStorageMonitor::RemoveSingleton();
   base::MessageLoop message_loop;
   test::TestStorageMonitor monitor;
   const std::string kDeviceId1 = "dcim:UUID:FFF0-0042";
   const string16 kDeviceName1 = ASCIIToUTF16("test");
   const base::FilePath kDevicePath1(FILE_PATH_LITERAL("/testfoo"));
   StorageInfo info1(kDeviceId1, kDeviceName1, kDevicePath1.value(),
                     string16(), string16(), string16(), 0);
   monitor.receiver()->ProcessAttach(info1);
   message_loop.RunUntilIdle();
   std::vector<StorageInfo> devices = monitor.GetAllAvailableStorages();
@@ skipping 26 matching lines @@
   EXPECT_EQ(kDeviceName2, devices[0].name());
   EXPECT_EQ(kDevicePath2.value(), devices[0].location());
 
   monitor.receiver()->ProcessDetach(kDeviceId2);
   message_loop.RunUntilIdle();
   devices = monitor.GetAllAvailableStorages();
   EXPECT_EQ(0U, devices.size());
 }
 
 }  // namespace chrome