[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm

Index: chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm
diff --git a/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm b/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm
index f55576f1f2f0b5bc8d5ab5a07eed7c47b89b3123..e770e1ddcc42167488cb606a3d67b77faa3e2bc8 100644
--- a/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm
+++ b/chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm
@@ -15,6 +15,7 @@
 #include "chrome/browser/storage_monitor/image_capture_device.h"
 #include "chrome/browser/storage_monitor/image_capture_device_manager.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -257,6 +258,8 @@ class ImageCaptureDeviceManagerTest : public testing::Test {
   virtual void SetUp() OVERRIDE {
     ui_thread_.reset(new content::TestBrowserThread(
         content::BrowserThread::UI, &message_loop_));
+
+    monitor_ = chrome::test::TestStorageMonitor::Create();

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

Leak?

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

no

   }
 
   MockICCameraDevice* AttachDevice(
@@ -278,28 +281,30 @@ class ImageCaptureDeviceManagerTest : public testing::Test {
  protected:
   base::MessageLoopForUI message_loop_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
-  chrome::test::TestStorageMonitor monitor_;
+
+  // Weak ptr to storage monitor owned by browser process.

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

Not Weak ptr

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

Done.

+  chrome::test::TestStorageMonitor* monitor_;
   TestCameraListener listener_;
 };
 
 TEST_F(ImageCaptureDeviceManagerTest, TestAttachDetach) {
   chrome::ImageCaptureDeviceManager manager;
-  manager.SetNotifications(monitor_.receiver());
+  manager.SetNotifications(monitor_->receiver());
   ICCameraDevice* device = AttachDevice(&manager);
   std::vector<chrome::StorageInfo> devices =
-      monitor_.GetAllAvailableStorages();
+      monitor_->GetAllAvailableStorages();
 
   ASSERT_EQ(1U, devices.size());
   EXPECT_EQ(std::string("ic:") + kDeviceId, devices[0].device_id());
 
   DetachDevice(&manager, device);
-  devices = monitor_.GetAllAvailableStorages();
+  devices = monitor_->GetAllAvailableStorages();
   ASSERT_EQ(0U, devices.size());
 };
 
 TEST_F(ImageCaptureDeviceManagerTest, OpenCamera) {
   chrome::ImageCaptureDeviceManager manager;
-  manager.SetNotifications(monitor_.receiver());
+  manager.SetNotifications(monitor_->receiver());
   ICCameraDevice* device = AttachDevice(&manager);
 
   EXPECT_FALSE(chrome::ImageCaptureDeviceManager::deviceForUUID(
@@ -335,7 +340,7 @@ TEST_F(ImageCaptureDeviceManagerTest, OpenCamera) {
 
 TEST_F(ImageCaptureDeviceManagerTest, RemoveCamera) {
   chrome::ImageCaptureDeviceManager manager;
-  manager.SetNotifications(monitor_.receiver());
+  manager.SetNotifications(monitor_->receiver());
   ICCameraDevice* device = AttachDevice(&manager);
 
   base::scoped_nsobject<ImageCaptureDevice> camera(
@@ -354,7 +359,7 @@ TEST_F(ImageCaptureDeviceManagerTest, DownloadFile) {
           content::BrowserThread::FILE, &message_loop_));
 
   chrome::ImageCaptureDeviceManager manager;
-  manager.SetNotifications(monitor_.receiver());
+  manager.SetNotifications(monitor_->receiver());
   MockICCameraDevice* device = AttachDevice(&manager);
 
   base::scoped_nsobject<ImageCaptureDevice> camera(
@@ -410,7 +415,7 @@ TEST_F(ImageCaptureDeviceManagerTest, TestSubdirectories) {
           content::BrowserThread::FILE, &message_loop_));
 
   chrome::ImageCaptureDeviceManager manager;
-  manager.SetNotifications(monitor_.receiver());
+  manager.SetNotifications(monitor_->receiver());
   MockICCameraDevice* device = AttachDevice(&manager);
 
   base::scoped_nsobject<ImageCaptureDevice> camera(