Change base::SystemMonitor's media device functions to take a type and string16 instead of a FilePa…

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"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.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/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 {
 
 using content::BrowserThread;
 using disks::DiskMountManager;
@@ skipping 112 matching lines @@
 
 // Simple test case where we attach and detach a media device.
 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);
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(0, kDevice1Name, mount_path1))
+  const std::string kDeviceId0 = "0";
+  EXPECT_CALL(observer(),
+              OnMediaDeviceAttached(kDeviceId0,
+                                    ASCIIToUTF16(kDevice1Name),
+                                    base::SystemMonitor::TYPE_PATH,
+                                    mount_path1.value()))
       .InSequence(mock_sequence);
   MountDevice(MOUNT_ERROR_NONE, mount_info);
 
-  EXPECT_CALL(observer(), OnMediaDeviceDetached(0)).InSequence(mock_sequence);
+  EXPECT_CALL(observer(), OnMediaDeviceDetached(kDeviceId0))
+      .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);
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(1, kDevice2Name, mount_path2))
+  const std::string kDeviceId1 = "1";
+
+  EXPECT_CALL(observer(),
+              OnMediaDeviceAttached(kDeviceId1,
+                                    ASCIIToUTF16(kDevice2Name),
+                                    base::SystemMonitor::TYPE_PATH,
+                                    mount_path2.value()))
       .InSequence(mock_sequence);
   MountDevice(MOUNT_ERROR_NONE, mount_info2);
 
-  EXPECT_CALL(observer(), OnMediaDeviceDetached(1)).InSequence(mock_sequence);
+  EXPECT_CALL(observer(), OnMediaDeviceDetached(kDeviceId1))
+      .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);
   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(), OnMediaDeviceAttached(_, _, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info);
 }
 
 // Non device mounts and mount errors are ignored.
 TEST_F(MediaDeviceNotificationsTest, Ignore) {
   testing::Sequence mock_sequence;
   FilePath mount_path = CreateMountPoint(kMountPointA, true);
   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(), OnMediaDeviceAttached(_, _, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_UNKNOWN, mount_info);
 
   // 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);
 
   // 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);
 }
 
 }  // namespace
 
 }  // namespace chrome