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

base/test/mock_devices_changed_observer.h

Index: base/test/mock_devices_changed_observer.h
===================================================================
--- base/test/mock_devices_changed_observer.h	(revision 147551)
+++ base/test/mock_devices_changed_observer.h	(working copy)
@@ -10,23 +10,21 @@
 #include "base/system_monitor/system_monitor.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-class FilePath;
-
 namespace base {
 
 class MockDevicesChangedObserver
-  : public base::SystemMonitor::DevicesChangedObserver {
+    : public base::SystemMonitor::DevicesChangedObserver {
  public:
   MockDevicesChangedObserver();
   ~MockDevicesChangedObserver();
 
   MOCK_METHOD0(OnDevicesChanged, void());
-  MOCK_METHOD3(OnMediaDeviceAttached,
-               void(const base::SystemMonitor::DeviceIdType& id,
-                    const std::string& name,
-                    const FilePath& path));
-  MOCK_METHOD1(OnMediaDeviceDetached,
-               void(const base::SystemMonitor::DeviceIdType& id));
+  MOCK_METHOD4(OnMediaDeviceAttached,
+               void(const std::string& id,
+                    const string16& name,
+                    base::SystemMonitor::MediaDeviceType type,
+                    const FilePath::StringType& location));
+  MOCK_METHOD1(OnMediaDeviceDetached, void(const std::string& id));
 
   DISALLOW_COPY_AND_ASSIGN(MockDevicesChangedObserver);
 };