[Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2)

chrome/browser/system_monitor/removable_device_notifications_window_win_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 "chrome/browser/system_monitor/removable_device_notifications_window_win.h"
 
 #include <dbt.h>
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "base/system_monitor/system_monitor.h"
-#include "base/test/mock_devices_changed_observer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
+#include "chrome/browser/system_monitor/mock_removable_storage_observer.h"
 #include "chrome/browser/system_monitor/portable_device_watcher_win.h"
 #include "chrome/browser/system_monitor/removable_device_constants.h"
 #include "chrome/browser/system_monitor/volume_mount_watcher_win.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome {
 
 typedef std::vector<int> DeviceIndices;
@@ skipping 292 matching lines @@
   void DoMassStorageDevicesDetachedTest(const DeviceIndices& device_indices);
 
   // Injects a device attach or detach change (depending on the value of
   // |test_attach|) and tests that the appropriate handler is called.
   void DoMTPDeviceTest(const string16& pnp_device_id, bool test_attach);
 
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
-  base::SystemMonitor system_monitor_;
-  base::MockDevicesChangedObserver observer_;
+  MockRemovableStorageObserver observer_;
   scoped_ptr<TestRemovableDeviceNotificationsWindowWin> window_;
   scoped_refptr<TestVolumeMountWatcherWin> volume_mount_watcher_;
 };
 
 RemovableDeviceNotificationsWindowWinTest::
     RemovableDeviceNotificationsWindowWinTest()
    : ui_thread_(BrowserThread::UI, &message_loop_),
      file_thread_(BrowserThread::FILE, &message_loop_) {
 }
 
 RemovableDeviceNotificationsWindowWinTest::
     ~RemovableDeviceNotificationsWindowWinTest() {
 }
 
 void RemovableDeviceNotificationsWindowWinTest::SetUp() {
   ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
   volume_mount_watcher_ = new TestVolumeMountWatcherWin;
   window_.reset(new TestRemovableDeviceNotificationsWindowWin(
       volume_mount_watcher_.get(), new TestPortableDeviceWatcherWin));
   window_->InitWithTestData(false);
   RunUntilIdle();
-  system_monitor_.AddDevicesChangedObserver(&observer_);
+  window_->AddObserver(&observer_);
 }
 
 void RemovableDeviceNotificationsWindowWinTest::TearDown() {
   RunUntilIdle();
-  system_monitor_.RemoveDevicesChangedObserver(&observer_);
+  window_->RemoveObserver(&observer_);
 }
 
 void RemovableDeviceNotificationsWindowWinTest::
     AddMassStorageDeviceAttachExpectation(FilePath drive) {
   std::string unique_id;
   string16 device_name;
   bool removable;
   ASSERT_TRUE(GetMassStorageDeviceDetails(drive, NULL, &unique_id,
                                           &device_name, &removable));
   if (removable) {
@@ skipping 212 matching lines @@
   PreAttachDevices();
 
   // An invalid path.
   EXPECT_FALSE(window_->GetDeviceInfoForPath(FilePath(L"COM1:\\"), NULL));
 
   // An unconnected removable device.
   EXPECT_FALSE(window_->GetDeviceInfoForPath(FilePath(L"E:\\"), NULL));
 
   // A connected removable device.
   FilePath removable_device(L"F:\\");
-  base::SystemMonitor::RemovableStorageInfo device_info;
+  RemovableStorageNotifications::StorageInfo device_info;
   EXPECT_TRUE(window_->GetDeviceInfoForPath(removable_device, &device_info));
 
   std::string unique_id;
   string16 device_name;
   bool removable;
   ASSERT_TRUE(GetMassStorageDeviceDetails(removable_device, NULL, &unique_id,
                                           &device_name, &removable));
   EXPECT_TRUE(removable);
   std::string device_id = MediaStorageUtil::MakeDeviceId(
       MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM, unique_id);
@@ skipping 31 matching lines @@
 
 // Attach a device with two data partitions. Verify that attach/detach
 // notifications are sent out for each removable storage.
 TEST_F(RemovableDeviceNotificationsWindowWinTest,
        MTPDeviceWithMultipleStorageObjects) {
   DoMTPDeviceTest(kMTPDeviceWithMultipleStorageObjects, true);
   DoMTPDeviceTest(kMTPDeviceWithMultipleStorageObjects, false);
 }
 
 }  // namespace chrome