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

chrome/browser/media_gallery/media_file_system_registry.h

 // 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.
 
 // MediaFileSystemRegistry registers pictures directories and media devices as
 // File API filesystems and keeps track of the path to filesystem ID mappings.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_
 
@@ skipping 29 matching lines @@
 
   // The instance is lazily created per browser process.
   static MediaFileSystemRegistry* GetInstance();
 
   // Returns the list of media filesystem IDs and paths for a given RPH.
   // Called on the UI thread.
   std::vector<MediaFSIDAndPath> GetMediaFileSystems(
       const content::RenderProcessHost* rph);
 
   // base::SystemMonitor::DevicesChangedObserver implementation.
-  virtual void OnMediaDeviceDetached(
-      const base::SystemMonitor::DeviceIdType& id) OVERRIDE;
+  virtual void OnMediaDeviceDetached(const std::string& id) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
   friend struct base::DefaultLazyInstanceTraits<MediaFileSystemRegistry>;
 
   // Mapping of media directories to filesystem IDs.
   typedef std::map<FilePath, std::string> MediaPathToFSIDMap;
 
   // Mapping of RPH to MediaPathToFSIDMaps.
   typedef std::map<const content::RenderProcessHost*,
                    MediaPathToFSIDMap> ChildIdToMediaFSMap;
 
   // Mapping of device id to mount path.
-  typedef std::map<base::SystemMonitor::DeviceIdType, FilePath>
-      DeviceIdToMediaPathMap;
+  typedef std::map<std::string, FilePath> DeviceIdToMediaPathMap;
 
   // Obtain an instance of this class via GetInstance().
   MediaFileSystemRegistry();
   virtual ~MediaFileSystemRegistry();
 
   // Helper functions to register / unregister listening for renderer process
   // closed / terminiated notifications.
   void RegisterForRPHGoneNotifications(const content::RenderProcessHost* rph);
   void UnregisterForRPHGoneNotifications(const content::RenderProcessHost* rph);
 
@@ skipping 11 matching lines @@
 
   // Is only used on the UI thread.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistry);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_FILE_SYSTEM_REGISTRY_H_