SystemMonitor: Pull device type into the device id

chrome/browser/media_gallery/media_device_notifications_chromeos_unittest.cc

Index: chrome/browser/media_gallery/media_device_notifications_chromeos_unittest.cc
diff --git a/chrome/browser/media_gallery/media_device_notifications_chromeos_unittest.cc b/chrome/browser/media_gallery/media_device_notifications_chromeos_unittest.cc
index 4a20b7afcc34303c9908267894d19b4df882b172..2135ce9f45211b329d350893c41dbbadc73761c7 100644
--- a/chrome/browser/media_gallery/media_device_notifications_chromeos_unittest.cc
+++ b/chrome/browser/media_gallery/media_device_notifications_chromeos_unittest.cc
@@ -74,10 +74,10 @@ class MediaDeviceNotificationsTest : public testing::Test {
 
   void MountDevice(MountError error_code,
                    const DiskMountManager::MountPointInfo& mount_info,
-                   const std::string& device_id) {
+                   const std::string& unique_id) {
     if (error_code == MOUNT_ERROR_NONE) {
       disk_mount_manager_mock_->CreateDiskEntryForMountDevice(
-        mount_info, device_id);
+        mount_info, unique_id);
     }
     notifications_->MountCompleted(disks::DiskMountManager::MOUNTING,
                                    error_code,
@@ -159,7 +159,6 @@ TEST_F(MediaDeviceNotificationsTest, BasicAttachDetach) {
   EXPECT_CALL(observer(),
               OnMediaDeviceAttached(kDeviceId0,
                                     ASCIIToUTF16(kDevice1Name),
-                                    base::SystemMonitor::TYPE_PATH,
                                     mount_path1.value()))
       .InSequence(mock_sequence);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kDeviceId0);
@@ -179,7 +178,6 @@ TEST_F(MediaDeviceNotificationsTest, BasicAttachDetach) {
   EXPECT_CALL(observer(),
               OnMediaDeviceAttached(kDeviceId1,
                                     ASCIIToUTF16(kDevice2Name),
-                                    base::SystemMonitor::TYPE_PATH,
                                     mount_path2.value()))
       .InSequence(mock_sequence);
   MountDevice(MOUNT_ERROR_NONE, mount_info2, kDeviceId1);
@@ -199,7 +197,7 @@ TEST_F(MediaDeviceNotificationsTest, DCIM) {
                                               mount_path.value(),
                                               MOUNT_TYPE_DEVICE,
                                               disks::MOUNT_CONDITION_NONE);
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kDeviceId);
 }
 
@@ -215,18 +213,18 @@ TEST_F(MediaDeviceNotificationsTest, Ignore) {
                                               mount_path.value(),
                                               MOUNT_TYPE_DEVICE,
                                               disks::MOUNT_CONDITION_NONE);
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_UNKNOWN, mount_info, kDeviceId);
 
   // Not a device
   mount_info.mount_type = MOUNT_TYPE_ARCHIVE;
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kDeviceId);
 
   // 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(), OnMediaDeviceAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kDeviceId);
 }