Add a receiver interface to RemovableStorageNotifications.

chrome/browser/system_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_path.h"
 #include "base/file_util.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 "base/system_monitor/system_monitor.h"
 #include "chrome/browser/system_monitor/image_capture_device.h"
 #include "chrome/browser/system_monitor/image_capture_device_manager.h"
+#include "chrome/browser/system_monitor/test_removable_storage_notifications.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 182 matching lines @@
   std::vector<std::string> items_;
   std::vector<std::string> downloads_;
   bool completed_;
   bool removed_;
   base::PlatformFileError last_error_;
 };
 
 class ImageCaptureDeviceManagerTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
-    base::SystemMonitor::AllocateSystemIOPorts();
-    system_monitor_.reset(new base::SystemMonitor());
     ui_thread_.reset(new content::TestBrowserThread(
         content::BrowserThread::UI, &message_loop_));
   }
 
   MockICCameraDevice* AttachDevice(
       chrome::ImageCaptureDeviceManager* manager) {
     // Ownership will be passed to the device browser delegate.
     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:
   MessageLoopForUI message_loop_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
-  scoped_ptr<base::SystemMonitor> system_monitor_;
+  chrome::test::TestRemovableStorageNotifications notifications_;
   TestCameraListener listener_;
 };
 
 TEST_F(ImageCaptureDeviceManagerTest, TestAttachDetach) {
   chrome::ImageCaptureDeviceManager manager;
+  manager.SetNotifications(notifications_.receiver());
   ICCameraDevice* device = AttachDevice(&manager);
-  std::vector<base::SystemMonitor::RemovableStorageInfo> devices =
-    system_monitor_->GetAttachedRemovableStorage();
+  std::vector<chrome::RemovableStorageNotifications::StorageInfo> devices =
+    notifications_.GetAttachedStorage();
 
   ASSERT_EQ(1U, devices.size());
   EXPECT_EQ(std::string("ic:") + kDeviceId, devices[0].device_id);
 
   DetachDevice(&manager, device);
-  devices = system_monitor_->GetAttachedRemovableStorage();
+  devices = notifications_.GetAttachedStorage();
   ASSERT_EQ(0U, devices.size());
 };
 
 TEST_F(ImageCaptureDeviceManagerTest, OpenCamera) {
   chrome::ImageCaptureDeviceManager manager;
+  manager.SetNotifications(notifications_.receiver());
   ICCameraDevice* device = AttachDevice(&manager);
 
   EXPECT_FALSE(chrome::ImageCaptureDeviceManager::deviceForUUID(
       "nonexistent"));
 
   scoped_nsobject<ImageCaptureDevice> camera(
       [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId)
           retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
@@ skipping 16 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(notifications_.receiver());
   ICCameraDevice* device = AttachDevice(&manager);
 
   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(notifications_.receiver());
   MockICCameraDevice* device = AttachDevice(&manager);
 
   scoped_nsobject<ImageCaptureDevice> camera(
       [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId)
           retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
 
   std::string kTestFileName("pic1");
@@ skipping 30 matching lines @@
   EXPECT_EQ(kTestFileName, listener_.downloads()[1]);
   ASSERT_EQ(base::PLATFORM_FILE_OK, listener_.last_error());
   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];
 }