SystemMonitor: Pull device type into the device id

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 70 matching lines @@
   // 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);
 
   // Registers a path as a media file system and return the filesystem id.
-  std::string RegisterPathAsFileSystem(
-      const base::SystemMonitor::MediaDeviceType& device_type,
-      const FilePath& path);
-
+  std::string RegisterPathAsFileSystem(const FilePath& path);
 
   // Revoke a media file system with a given |path|.
-  void RevokeMediaFileSystem(
-      const base::SystemMonitor::MediaDeviceType& device_type,
-      const FilePath& path);
+  void RevokeMediaFileSystem(const FilePath& path);
 
   // Only accessed on the UI thread.
   ChildIdToMediaFSMap media_fs_map_;
 
   // Only accessed on the UI thread.
   DeviceIdToInfoMap device_id_map_;
 
   // 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_