SystemMonitor: Pull device type into the device id

chrome/browser/media_gallery/media_device_notifications_linux.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.
 
 // MediaDeviceNotificationsLinux listens for mount point changes and notifies
 // the SystemMonitor about the addition and deletion of media devices.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_
 
 #if defined(OS_CHROMEOS)
 #error "Use the ChromeOS-specific implementation instead."
 #endif
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/browser_thread.h"
 
 class FilePath;
 
 // Gets the media device information given a |device_path|. On success,
-// returns true and fills in |device_name| and |device_id|.
+// returns true and fills in |name| and |id|.
 typedef bool (*GetDeviceInfoFunc)(const std::string& device_path,
-                                  std::string* device_name,
-                                  string16* device_id);
+                                  std::string* id,
+                                  string16* name);
 
 namespace chrome {
 
 class MediaDeviceNotificationsLinux
     : public base::RefCountedThreadSafe<MediaDeviceNotificationsLinux,
           content::BrowserThread::DeleteOnFileThread> {
  public:
   explicit MediaDeviceNotificationsLinux(const FilePath& path);
 
   // Must be called for MediaDeviceNotificationsLinux to work.
@@ skipping 67 matching lines @@
   // Function handler to get device information. This is useful to set a mock
   // handler for unit testing.
   GetDeviceInfoFunc get_device_info_func_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaDeviceNotificationsLinux);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_DEVICE_NOTIFICATIONS_LINUX_H_