[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 chrome {
 
 TEST(StorageMonitorTest, TestInitialize) {
+  test::TestStorageMonitor::RemoveSingleton();
   test::TestStorageMonitor monitor;
   EXPECT_FALSE(monitor.init_called_);
 
   base::WaitableEvent event(false, false);

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

aside: WaitableEvent seems like the wrong primitive here, nothing waits on it,
nor does it need to.

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

Yeah. It's a handy latch. I don't think we have a handier one.

[vandebo (ex-Chrome), 2013/07/11 15:53:00]

This is only slightly more code and is easier to understand:

void SetIfCalled(bool* called) {
 *called = true;
}

bool called = false;
monit.EnsureInitialized(base::Bind(&SetIfCalled, base::Unretained(&called)));
...

[Greg Billock, 2013/07/11 20:53:35]

ok. done.

On 2013/07/11 15:53:00, vandebo wrote:

   monitor.EnsureInitialized(base::Bind(&base::WaitableEvent::Signal,
                                        base::Unretained(&event)));
   EXPECT_TRUE(monitor.init_called_);
   EXPECT_FALSE(event.IsSignaled());
   monitor.MarkInitialized();
   EXPECT_TRUE(event.IsSignaled());
 }
 
 TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {
   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::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);
 
   StorageInfo info(kDeviceId1, kDeviceName, FILE_PATH_LITERAL("path"),
                    string16(), string16(), string16(), 0);
   monitor.receiver()->ProcessAttach(info);
   message_loop.RunUntilIdle();
 
   EXPECT_EQ(kDeviceId1, observer1.last_attached().device_id());
@@ skipping 22 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) {
   base::MessageLoop message_loop;
+  test::TestStorageMonitor::RemoveSingleton();
   test::TestStorageMonitor monitor;
   std::vector<StorageInfo> devices = monitor.GetAllAvailableStorages();
   EXPECT_EQ(0U, devices.size());
 }
 
 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");
   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();
   ASSERT_EQ(1U, devices.size());
@@ skipping 25 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