SystemMonitor: Pull device type into the device id

chrome/browser/media_gallery/media_device_notifications_linux.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.
 
 // MediaDeviceNotificationsLinux implementation.
 
 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
 
 #include <libudev.h>
 #include <mntent.h>
 #include <stdio.h>
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_generic_obj.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/media_gallery/media_device_notifications_utils.h"
+#include "chrome/browser/media_gallery/media_storage_util.h"
 
 namespace {
 
 // List of file systems we care about.
 const char* const kKnownFileSystems[] = {
   "ext2",
   "ext3",
   "ext4",
   "fat",
   "hfsplus",
@@ skipping 297 matching lines @@
     }
   }
 }
 
 void MediaDeviceNotificationsLinux::CheckAndAddMediaDevice(
     const std::string& mount_device,
     const std::string& mount_point) {
   if (!IsMediaDevice(mount_point))
     return;
 
-  std::string device_id;
+  std::string unique_id;
   string16 device_name;
-  bool result = (*get_device_info_func_)(mount_device, &device_id,
+  bool result = (*get_device_info_func_)(mount_device, &unique_id,
                                          &device_name);
 
   // Keep track of GetDeviceInfo result, to see how often we fail to get device
   // details.
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.device_info_available",
                         result);
   if (!result)
     return;
 
   // Keep track of device uuid, to see how often we receive empty values.
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.device_uuid_available",
-                        !device_id.empty());
+                        !unique_id.empty());
   UMA_HISTOGRAM_BOOLEAN("MediaDeviceNotification.device_name_available",
                         !device_name.empty());
 
-  if (device_id.empty() || device_name.empty())
+  if (unique_id.empty() || device_name.empty())
     return;
 
   MountDeviceAndId mount_device_and_id;
   mount_device_and_id.mount_device = mount_device;
-  mount_device_and_id.device_id = device_id;
+  mount_device_and_id.device_id = MediaStorageUtil::MakeDeviceId(
+      MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM, unique_id);

[kmadhusu, 2012/08/17 18:53:35]

Can we construct the DeviceId in get_device_info_func_?

[vandebo (ex-Chrome), 2012/08/17 22:55:51]

SGTM. Done.

   mount_info_map_[mount_point] = mount_device_and_id;
 
   base::SystemMonitor* system_monitor = base::SystemMonitor::Get();
-  system_monitor->ProcessMediaDeviceAttached(device_id,
+  system_monitor->ProcessMediaDeviceAttached(mount_device_and_id.device_id,
                                              device_name,
-                                             SystemMonitor::TYPE_PATH,
                                              mount_point);
 }
 
 void MediaDeviceNotificationsLinux::RemoveOldDevice(
     const std::string& device_id) {
   base::SystemMonitor* system_monitor = base::SystemMonitor::Get();
   system_monitor->ProcessMediaDeviceDetached(device_id);
 }
 
 }  // namespace chrome