Rename SystemMonitor's MediaDevice calls to RemovableStorage.

chrome/browser/media_gallery/media_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::MediaDeviceNotifications unit tests.
 
 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 145 matching lines @@
 TEST_F(MediaDeviceNotificationsTest, BasicAttachDetach) {
   testing::Sequence mock_sequence;
   FilePath mount_path1 = CreateMountPoint(kMountPointA, true);
   ASSERT_FALSE(mount_path1.empty());
   DiskMountManager::MountPointInfo mount_info(kDevice1,
                                               mount_path1.value(),
                                               MOUNT_TYPE_DEVICE,
                                               disks::MOUNT_CONDITION_NONE);
   const std::string kUniqueId0 = "FFFF-FFFF";
   EXPECT_CALL(observer(),
-              OnMediaDeviceAttached(GetDCIMDeviceId(kUniqueId0),
-                                    ASCIIToUTF16(kDevice1Name),
-                                    mount_path1.value()))
+              OnRemovableStorageAttached(GetDCIMDeviceId(kUniqueId0),
+                                         ASCIIToUTF16(kDevice1Name),
+                                         mount_path1.value()))
       .InSequence(mock_sequence);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kUniqueId0);
 
-  EXPECT_CALL(observer(), OnMediaDeviceDetached(GetDCIMDeviceId(kUniqueId0)))
+  EXPECT_CALL(observer(),
+              OnRemovableStorageDetached(GetDCIMDeviceId(kUniqueId0)))
       .InSequence(mock_sequence);
   UnmountDevice(MOUNT_ERROR_NONE, mount_info);
 
   FilePath mount_path2 = CreateMountPoint(kMountPointB, true);
   ASSERT_FALSE(mount_path2.empty());
   DiskMountManager::MountPointInfo mount_info2(kDevice2,
                                                mount_path2.value(),
                                                MOUNT_TYPE_DEVICE,
                                                disks::MOUNT_CONDITION_NONE);
   const std::string kUniqueId1 = "FFF0-FFF0";
 
   EXPECT_CALL(observer(),
-              OnMediaDeviceAttached(GetDCIMDeviceId(kUniqueId1),
-                                    ASCIIToUTF16(kDevice2Name),
-                                    mount_path2.value()))
+              OnRemovableStorageAttached(GetDCIMDeviceId(kUniqueId1),
+                                         ASCIIToUTF16(kDevice2Name),
+                                         mount_path2.value()))
       .InSequence(mock_sequence);
   MountDevice(MOUNT_ERROR_NONE, mount_info2, kUniqueId1);
 
-  EXPECT_CALL(observer(), OnMediaDeviceDetached(GetDCIMDeviceId(kUniqueId1)))
+  EXPECT_CALL(observer(),
+              OnRemovableStorageDetached(GetDCIMDeviceId(kUniqueId1)))
       .InSequence(mock_sequence);
   UnmountDevice(MOUNT_ERROR_NONE, mount_info2);
 }
 
 // Only mount points with DCIM directories are recognized.
 TEST_F(MediaDeviceNotificationsTest, DCIM) {
   testing::Sequence mock_sequence;
   FilePath mount_path = CreateMountPoint(kMountPointA, false);
   const std::string kUniqueId = "FFFF-FFFF";
   ASSERT_FALSE(mount_path.empty());
   DiskMountManager::MountPointInfo mount_info(kDevice1,
                                               mount_path.value(),
                                               MOUNT_TYPE_DEVICE,
                                               disks::MOUNT_CONDITION_NONE);
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kUniqueId);
 }
 
 // Non device mounts and mount errors are ignored.
 TEST_F(MediaDeviceNotificationsTest, Ignore) {
   testing::Sequence mock_sequence;
   FilePath mount_path = CreateMountPoint(kMountPointA, true);
   const std::string kUniqueId = "FFFF-FFFF";
   ASSERT_FALSE(mount_path.empty());
 
   // Mount error.
   DiskMountManager::MountPointInfo mount_info(kDevice1,
                                               mount_path.value(),
                                               MOUNT_TYPE_DEVICE,
                                               disks::MOUNT_CONDITION_NONE);
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_UNKNOWN, mount_info, kUniqueId);
 
   // Not a device
   mount_info.mount_type = MOUNT_TYPE_ARCHIVE;
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kUniqueId);
 
   // Unsupported file system.
   mount_info.mount_type = MOUNT_TYPE_DEVICE;
   mount_info.mount_condition = disks::MOUNT_CONDITION_UNSUPPORTED_FILESYSTEM;
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kUniqueId);
 }
 
 }  // namespace
 
 }  // namespace chrome