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

chrome/browser/media_gallery/media_device_notifications_linux_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.
 
 // MediaDeviceNotificationsLinux unit tests.
 
 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
 
 #include <string>
 
 #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 "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome {
 
 namespace {
 
 using testing::_;
 
 const char kValidFS[] = "vfat";
@@ skipping 198 matching lines @@
 // Simple test case where we attach and detach a media device.
 TEST_F(MediaDeviceNotificationsLinuxTest, BasicAttachDetach) {
   testing::Sequence mock_sequence;
   FilePath test_path = CreateMountPointWithDCIMDir(kMountPointA);
   ASSERT_FALSE(test_path.empty());
   MtabTestData test_data[] = {
     MtabTestData(kDevice1, kInvalidPath, kValidFS),
     MtabTestData(kDevice2, test_path.value(), kValidFS),
   };
   // Only |kDevice2| should be attached, since |kDevice1| has a bad path.
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(0, kDevice2, test_path))
+  EXPECT_CALL(observer(),
+              OnMediaDeviceAttached(0,
+                                    kDevice2,
+                                    base::SystemMonitor::TYPE_PATH,
+                                    UTF8ToUTF16(test_path.value())))
       .InSequence(mock_sequence);
   AppendToMtabAndRunLoop(test_data, arraysize(test_data));
 
   // |kDevice2| should be detached here.
   EXPECT_CALL(observer(), OnMediaDeviceDetached(0)).InSequence(mock_sequence);
   WriteEmptyMtabAndRunLoop();
 }
 
 // Only mount points with DCIM directories are recognized.
 TEST_F(MediaDeviceNotificationsLinuxTest, DCIM) {
   testing::Sequence mock_sequence;
   FilePath test_path_a = CreateMountPointWithDCIMDir(kMountPointA);
   ASSERT_FALSE(test_path_a.empty());
   MtabTestData test_data1[] = {
     MtabTestData(kDevice1, test_path_a.value(), kValidFS),
   };
   // |kDevice1| should be attached as expected.
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(0, kDevice1, test_path_a))
+  EXPECT_CALL(observer(),
+              OnMediaDeviceAttached(0,
+                                    kDevice1,
+                                    base::SystemMonitor::TYPE_PATH,
+                                    UTF8ToUTF16(test_path_a.value())))
       .InSequence(mock_sequence);
   AppendToMtabAndRunLoop(test_data1, arraysize(test_data1));
 
   // This should do nothing, since |kMountPointB| does not have a DCIM dir.
   FilePath test_path_b = CreateMountPointWithoutDCIMDir(kMountPointB);
   ASSERT_FALSE(test_path_b.empty());
   MtabTestData test_data2[] = {
     MtabTestData(kDevice2, test_path_b.value(), kValidFS),
   };
   AppendToMtabAndRunLoop(test_data2, arraysize(test_data2));
@@ skipping 10 matching lines @@
   ASSERT_FALSE(test_path_a.empty());
   ASSERT_FALSE(test_path_b.empty());
 
   // Attach two devices.
   // kDevice1 -> kMountPointA
   // kDevice2 -> kMountPointB
   MtabTestData test_data1[] = {
     MtabTestData(kDevice1, test_path_a.value(), kValidFS),
     MtabTestData(kDevice2, test_path_b.value(), kValidFS),
   };
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(2);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(2);
   EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(0);
   AppendToMtabAndRunLoop(test_data1, arraysize(test_data1));
 
   // Attach |kDevice1| to |kMountPointB|.
   // |kDevice2| is inaccessible, so it is detached. |kDevice1| has been
   // re-attached at |kMountPointB|, so it is 'detached' from kMountPointA.
   // kDevice1 -> kMountPointA
   // kDevice2 -> kMountPointB
   // kDevice1 -> kMountPointB
   MtabTestData test_data2[] = {
     MtabTestData(kDevice1, test_path_b.value(), kValidFS),
   };
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(1);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(1);
   EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(2);
   AppendToMtabAndRunLoop(test_data2, arraysize(test_data2));
 
   // Attach |kDevice2| to |kMountPointA|.
   // kDevice1 -> kMountPointA
   // kDevice2 -> kMountPointB
   // kDevice1 -> kMountPointB
   // kDevice2 -> kMountPointA
   MtabTestData test_data3[] = {
     MtabTestData(kDevice2, test_path_a.value(), kValidFS),
   };
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(1);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(1);
   EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(0);
   AppendToMtabAndRunLoop(test_data3, arraysize(test_data3));
 
   // Detach |kDevice2| from |kMountPointA|.
   // kDevice1 -> kMountPointA
   // kDevice2 -> kMountPointB
   // kDevice1 -> kMountPointB
   MtabTestData test_data4[] = {
     MtabTestData(kDevice1, test_path_a.value(), kValidFS),
     MtabTestData(kDevice2, test_path_b.value(), kValidFS),
     MtabTestData(kDevice1, test_path_b.value(), kValidFS),
   };
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(0);
   EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(1);
   OverwriteMtabAndRunLoop(test_data4, arraysize(test_data4));
 
   // Detach |kDevice1| from |kMountPointB|.
   // kDevice1 -> kMountPointA
   // kDevice2 -> kMountPointB
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(2);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(2);
   EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(1);
   OverwriteMtabAndRunLoop(test_data1, arraysize(test_data1));
 
   // Detach all devices.
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(0);
   EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(2);
   WriteEmptyMtabAndRunLoop();
 }
 
 // More complicated test case with multiple devices on one mount point.
 TEST_F(MediaDeviceNotificationsLinuxTest, MultiDevicesOneMountPoint) {
   FilePath test_path_a = CreateMountPointWithDCIMDir(kMountPointA);
   FilePath test_path_b = CreateMountPointWithDCIMDir(kMountPointB);
+  string16 test_path_b_str16 = UTF8ToUTF16(test_path_b.value());
   ASSERT_FALSE(test_path_a.empty());
   ASSERT_FALSE(test_path_b.empty());
 
   // |kDevice1| is most recently mounted at |kMountPointB|.
   // kDevice1 -> kMountPointA
   // kDevice2 -> kMountPointB
   // kDevice1 -> kMountPointB
   MtabTestData test_data1[] = {
     MtabTestData(kDevice1, test_path_a.value(), kValidFS),
     MtabTestData(kDevice2, test_path_b.value(), kValidFS),
     MtabTestData(kDevice1, test_path_b.value(), kValidFS),
   };
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(0, kDevice1, test_path_b))
+  EXPECT_CALL(observer(),
+              OnMediaDeviceAttached(0,
+                                    kDevice1,
+                                    base::SystemMonitor::TYPE_PATH,
+                                    test_path_b_str16))
       .Times(1);
   EXPECT_CALL(observer(), OnMediaDeviceDetached(_)).Times(0);
   OverwriteMtabAndRunLoop(test_data1, arraysize(test_data1));
 
   // Attach |kDevice3| to |kMountPointB|.
   // |kDevice1| is inaccessible at its most recent mount point, so it is
   // detached and unavailable, even though it is still accessible via
   // |kMountPointA|.
   // kDevice1 -> kMountPointA
   // kDevice2 -> kMountPointB
   // kDevice1 -> kMountPointB
   // kDevice3 -> kMountPointB
   MtabTestData test_data2[] = {
     MtabTestData(kDevice3, test_path_b.value(), kValidFS),
   };
   EXPECT_CALL(observer(), OnMediaDeviceDetached(0)).Times(1);
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(1, kDevice3, test_path_b))
+  EXPECT_CALL(observer(),
+              OnMediaDeviceAttached(1,
+                                    kDevice3,
+                                    base::SystemMonitor::TYPE_PATH,
+                                    test_path_b_str16))
       .Times(1);
   AppendToMtabAndRunLoop(test_data2, arraysize(test_data2));
 
   // Detach all devices.
-  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _)).Times(0);
+  EXPECT_CALL(observer(), OnMediaDeviceAttached(_, _, _, _)).Times(0);
   EXPECT_CALL(observer(), OnMediaDeviceDetached(1)).Times(1);
   WriteEmptyMtabAndRunLoop();
 }
 
 }  // namespace
 
 }  // namespace chrome