Extract and dispatch device uuid in media device attached notification message.

chrome/browser/media_gallery/media_device_notifications_chromeos.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.
 
 // chromeos::MediaDeviceNotifications implementation.
 
 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
+#include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/media_gallery/media_device_notifications_utils.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
 
+namespace {
+
+std::string GetDeviceUuid(const std::string& source_path) {
+  // Get the media device uuid if exists.
+  const disks::DiskMountManager::DiskMap& disks =
+      disks::DiskMountManager::GetInstance()->disks();
+  disks::DiskMountManager::DiskMap::const_iterator it = disks.find(source_path);
+  std::string device_id;

[Lei Zhang, 2012/07/26 18:34:31]

you can further simplify lines 27-32 to:

  return it == disks.end() ? std::string() : it->second->fs_uuid();

[kmadhusu, 2012/07/26 18:44:50]

Done.

+  if (it != disks.end()) {
+    const disks::DiskMountManager::Disk& disk = *it->second;
+    device_id = disk.fs_uuid();

[Ben Chan, 2012/07/26 17:56:03]

this may be simpler:

if (it != disks.end())
  device_id = it->second->fs_uuid();


On another note, having seen several places doing similar lookup, it feels like
DiskMountManager should provide a FindDiskBySourcePath method instead of
exposing disks(), which violates the law of diameters. But that can be cleaned
up in a subsequent CL.

[kmadhusu, 2012/07/26 18:44:50]

done.
I will submit a different CL to address this.

+  }
+  return device_id;
+}
+
+}  // namespace
+
 using content::BrowserThread;
 
-MediaDeviceNotifications::MediaDeviceNotifications()
-    : current_device_id_(0) {
+MediaDeviceNotifications::MediaDeviceNotifications() {
   DCHECK(disks::DiskMountManager::GetInstance());
   disks::DiskMountManager::GetInstance()->AddObserver(this);
 }
 
 MediaDeviceNotifications::~MediaDeviceNotifications() {
   disks::DiskMountManager* manager = disks::DiskMountManager::GetInstance();
   if (manager) {
     manager->RemoveObserver(this);
   }
 }
@@ skipping 61 matching lines @@
 }
 
 void MediaDeviceNotifications::AddMountedPathOnUIThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (ContainsKey(mount_map_, mount_info.mount_path)) {
     NOTREACHED();
     return;
   }
-  const std::string device_id_str = base::IntToString(current_device_id_++);
+
+  // Get the media device uuid if exists.
+  std::string device_id_str = GetDeviceUuid(mount_info.source_path);
+
+  // Keep track of device uuid, to see how often we receive empty uuid values.
+  static base::Histogram* media_device_uuid_available(NULL);

[Lei Zhang, 2012/07/26 18:34:31]

I see some Histogram code that uses a static Histogram pointer, but more code
that do not.

+jar: What's preferred? This code only gets called when someone connects a USB
drive to their CrOS device. Which is a relatively rare event.

+  if (!media_device_uuid_available) {
+    media_device_uuid_available = base::BooleanHistogram::FactoryGet(
+        "MediaDeviceNotification.device_uuid_available",
+        base::Histogram::kUmaTargetedHistogramFlag);
+  }
+  media_device_uuid_available->AddBoolean(!device_id_str.empty());
+  if (device_id_str.empty())
+    return;
+
   mount_map_.insert(std::make_pair(mount_info.mount_path, device_id_str));
   base::SystemMonitor::Get()->ProcessMediaDeviceAttached(
       device_id_str,
       UTF8ToUTF16(FilePath(mount_info.source_path).BaseName().value()),
       base::SystemMonitor::TYPE_PATH,
       mount_info.mount_path);
 }
 
 }  // namespace chrome