[StorageMonitor] Move StorageMonitor ownership to BrowserProcessImpl

chrome/browser/storage_monitor/image_capture_device_manager_unittest.mm

 // 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.
 
 
 #import <Foundation/Foundation.h>
 #import <ImageCaptureCore/ImageCaptureCore.h>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #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"
 
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
 
 @interface NSObject (ICCameraDeviceDelegateLionAPI)
 - (void)deviceDidBecomeReadyWithCompleteContentCatalog:(ICDevice*)device;
 - (void)didDownloadFile:(ICCameraFile*)file
                   error:(NSError*)error
@@ skipping 222 matching lines @@
   bool completed_;
   bool removed_;
   base::PlatformFileError last_error_;
 };
 
 class ImageCaptureDeviceManagerTest : public testing::Test {
  public:
   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(
       chrome::ImageCaptureDeviceManager* manager) {
     // Ownership will be passed to the device browser delegate.
     base::scoped_nsobject<MockICCameraDevice> device(
         [[MockICCameraDevice alloc] init]);
     id<ICDeviceBrowserDelegate> delegate = manager->device_browser();
     [delegate deviceBrowser:nil didAddDevice:device moreComing:NO];
     return device.autorelease();
   }
 
   void DetachDevice(chrome::ImageCaptureDeviceManager* manager,
                     ICCameraDevice* device) {
     id<ICDeviceBrowserDelegate> delegate = manager->device_browser();
     [delegate deviceBrowser:nil didRemoveDevice:device moreGoing:NO];
   }
 
  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(
       "nonexistent"));
 
   base::scoped_nsobject<ImageCaptureDevice> camera(
       [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId) retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
@@ skipping 15 matching lines @@
   EXPECT_TRUE(listener_.completed());
 
   [camera close];
   DetachDevice(&manager, device);
   EXPECT_FALSE(chrome::ImageCaptureDeviceManager::deviceForUUID(
       kDeviceId));
 }
 
 TEST_F(ImageCaptureDeviceManagerTest, RemoveCamera) {
   chrome::ImageCaptureDeviceManager manager;
-  manager.SetNotifications(monitor_.receiver());
+  manager.SetNotifications(monitor_->receiver());
   ICCameraDevice* device = AttachDevice(&manager);
 
   base::scoped_nsobject<ImageCaptureDevice> camera(
       [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId) retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
 
   [camera didRemoveDevice:device];
   EXPECT_TRUE(listener_.removed());
 }
 
 TEST_F(ImageCaptureDeviceManagerTest, DownloadFile) {
   scoped_ptr<content::TestBrowserThread> file_thread(
       new content::TestBrowserThread(
           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(
       [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId) retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
 
   std::string kTestFileName("pic1");
 
@@ skipping 35 matching lines @@
 
   [camera didRemoveDevice:device];
 }
 
 TEST_F(ImageCaptureDeviceManagerTest, TestSubdirectories) {
   scoped_ptr<content::TestBrowserThread> file_thread(
       new content::TestBrowserThread(
           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(
       [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId) retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
 
   std::string kTestFileName("pic1");
   base::scoped_nsobject<MockICCameraFile> picture1(
@@ skipping 10 matching lines @@
   message_loop_.RunUntilIdle();
 
   char file_contents[5];
   ASSERT_EQ(4, file_util::ReadFile(temp_file, file_contents,
                                    strlen(kTestFileContents)));
   EXPECT_EQ(kTestFileContents,
             std::string(file_contents, strlen(kTestFileContents)));
 
   [camera didRemoveDevice:device];
 }