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

 // 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.
 
 #include "chrome/browser/intents/device_attached_intent_source.h"
 
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 13 matching lines @@
     sys_monitor->AddDevicesChangedObserver(this);
 }
 
 DeviceAttachedIntentSource::~DeviceAttachedIntentSource() {
   SystemMonitor* sys_monitor = SystemMonitor::Get();
   if (sys_monitor)
     sys_monitor->RemoveDevicesChangedObserver(this);
 }
 
 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;
 
   // Register device path as an isolated file system.
   const std::string filesystem_id =
       fileapi::IsolatedContext::GetInstance()->RegisterFileSystemForFile(
           device_path, &device_name);
 
   CHECK(!filesystem_id.empty());
   webkit_glue::WebIntentData intent(
       ASCIIToUTF16("chrome-extension://attach"),
       ASCIIToUTF16("chrome-extension://filesystem"),
       device_name,
       filesystem_id);
 
-  content::WebIntentsDispatcher* dispatcher =
-      content::WebIntentsDispatcher::Create(intent);
-  delegate_->WebIntentDispatch(NULL, dispatcher);
+  delegate_->WebIntentDispatch(NULL  /* no WebContents */,
+                               content::WebIntentsDispatcher::Create(intent));
 }