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

chrome/browser/system_monitor/removable_device_notifications_chromeos_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.
 
 // chromeos::RemovableDeviceNotificationsCros unit tests.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.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/removable_device_constants.h"
 #include "chromeos/disks/mock_disk_mount_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 59 matching lines @@
   // Create a directory named |dir| relative to the test directory.
   // Set |with_dcim_dir| to true if the created directory will have a "DCIM"
   // subdirectory.
   // Returns the full path to the created directory on success, or an empty
   // path on failure.
   FilePath CreateMountPoint(const std::string& dir, bool with_dcim_dir);
 
   static void PostQuitToUIThread();
   static void WaitForFileThread();
 
-  base::MockDevicesChangedObserver& observer() {
-    return *mock_devices_changed_observer_;
+  MockStorageObserver& observer() {
+    return *mock_storage_observer_;
   }
 
  private:
   // The message loops and threads to run tests on.
   MessageLoop ui_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   // Temporary directory for created test data.
   base::ScopedTempDir scoped_temp_dir_;
 
   // Objects that talks with RemovableDeviceNotificationsCros.
-  base::SystemMonitor system_monitor_;
-  scoped_ptr<base::MockDevicesChangedObserver> mock_devices_changed_observer_;
+  scoped_ptr<MockStorageObserver> mock_storage_observer_;
   // Owned by DiskMountManager.
   disks::MockDiskMountManager* disk_mount_manager_mock_;
 
   scoped_refptr<RemovableDeviceNotificationsCros> notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsCrosTest);
 };
 
 RemovableDeviceNotificationsCrosTest::RemovableDeviceNotificationsCrosTest()
     : ui_thread_(BrowserThread::UI, &ui_loop_),
       file_thread_(BrowserThread::FILE) {
 }
 
 RemovableDeviceNotificationsCrosTest::~RemovableDeviceNotificationsCrosTest() {
 }
 
 void RemovableDeviceNotificationsCrosTest::SetUp() {
   ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir());
   file_thread_.Start();
-  mock_devices_changed_observer_.reset(new base::MockDevicesChangedObserver);
-  system_monitor_.AddDevicesChangedObserver(
-      mock_devices_changed_observer_.get());
+  mock_storage_observer_.reset(new MockStorageObserver);
+  notifications_->AddRemovableStorageObserver(
+      mock_storage_observer_.get());
 
   disk_mount_manager_mock_ = new disks::MockDiskMountManager();
   DiskMountManager::InitializeForTesting(disk_mount_manager_mock_);
   disk_mount_manager_mock_->SetupDefaultReplies();
 
   // Initialize the test subject.
   notifications_ = new RemovableDeviceNotificationsCros();
 }
 
 void RemovableDeviceNotificationsCrosTest::TearDown() {
   notifications_ = NULL;
   disk_mount_manager_mock_ = NULL;
   DiskMountManager::Shutdown();
-  system_monitor_.RemoveDevicesChangedObserver(
-      mock_devices_changed_observer_.get());
+  notifications_->RemoveRemovableStorageObserver(
+      mock_storage_observer_.get());
   WaitForFileThread();
 }
 
 void RemovableDeviceNotificationsCrosTest::MountDevice(
     MountError error_code,
     const DiskMountManager::MountPointInfo& mount_info,
     const std::string& unique_id,
     const std::string& device_label,
     const std::string& vendor_name,
     const std::string& product_name,
@@ skipping 226 matching lines @@
   EXPECT_EQ(kDevice1SizeInBytes, GetDeviceStorageSize(mount_path1.value()));
   EXPECT_CALL(observer(),
               OnRemovableStorageDetached(GetDCIMDeviceId(kUniqueId1)))
       .InSequence(mock_sequence);
   UnmountDevice(MOUNT_ERROR_NONE, mount_info);
 }
 
 }  // namespace
 
 }  // namespace chrome