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

chrome/browser/intents/device_attached_intent_source.cc

Index: chrome/browser/intents/device_attached_intent_source.cc
===================================================================
--- chrome/browser/intents/device_attached_intent_source.cc	(revision 147551)
+++ chrome/browser/intents/device_attached_intent_source.cc	(working copy)
@@ -31,16 +31,21 @@
 }
 
 void DeviceAttachedIntentSource::OnMediaDeviceAttached(
-    const base::SystemMonitor::DeviceIdType& id,
-    const std::string& name,
-    const FilePath& device_path) {
+    const std::string& id,
+    const string16& name,
+    base::SystemMonitor::MediaDeviceType type,
+    const FilePath::StringType& location) {
   if (!browser_->window()->IsActive())
     return;
 
+  // Only handle FilePaths for now.
+  if (type != SystemMonitor::TYPE_PATH)
+    return;
+
   // Sanity checks for |device_path|.
-  if (!device_path.IsAbsolute() || device_path.ReferencesParent()) {
+  const FilePath device_path(location);
+  if (!device_path.IsAbsolute() || device_path.ReferencesParent())
     return;
-  }
 
   std::string device_name;
 
@@ -56,7 +61,6 @@
       device_name,
       filesystem_id);
 
-  content::WebIntentsDispatcher* dispatcher =
-      content::WebIntentsDispatcher::Create(intent);
-  delegate_->WebIntentDispatch(NULL, dispatcher);
+  delegate_->WebIntentDispatch(NULL  /* no WebContents */,
+                               content::WebIntentsDispatcher::Create(intent));
 }