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"
@@ skipping 55 matching lines @@
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           base::Bind(&MediaDeviceNotifications::CheckMountedPathOnFileThread,
                      this, mount_info));
       break;
     }
     case disks::DiskMountManager::UNMOUNTING: {
       MountMap::iterator it = mount_map_.find(mount_info.mount_path);
       if (it == mount_map_.end())
         return;
+
+      LOG(ERROR) << "UNMOUNTING DEVICE ID: " << it->second << "\n";
       base::SystemMonitor::Get()->ProcessMediaDeviceDetached(it->second);
       mount_map_.erase(it);
       break;
     }
   }
 }
 
 void MediaDeviceNotifications::CheckMountedPathOnFileThread(
     const disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!chrome::IsMediaDevice(mount_info.mount_path))
     return;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&MediaDeviceNotifications::AddMountedPathOnUIThread,
                  this, mount_info));
 }
 
 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.
+  const disks::DiskMountManager::DiskMap& disks =
+      disks::DiskMountManager::GetInstance()->disks();
+  disks::DiskMountManager::DiskMap::const_iterator iter =
+       disks.find(mount_info.source_path);
+  std::string device_id_str;
+  if (iter != disks.end()) {

[Lei Zhang, 2012/07/26 02:17:32]

nit: would you mind using |it| instead of |iter| to be consistent with the rest
of the file?

[Lei Zhang, 2012/07/26 02:17:32]

If I understand the disk manager code correctly, I think you should be able to
CHECK_NE(it, disks.end());

[kmadhusu, 2012/07/26 17:01:23]

Done.

[kmadhusu, 2012/07/26 17:01:23]

I was not able to use CHECK_NE. Why do you think it should work?

+    const disks::DiskMountManager::Disk& disk = *iter->second;
+    device_id_str = disk.fs_uuid();
+  }
+  // TODO(kmadhusu, thestig): Set the unique id for mtp devices.
+  if (device_id_str.empty())
+    device_id_str =  base::IntToString(current_device_id_++);

[Lei Zhang, 2012/07/26 02:17:32]

You should get rid of |current_device_id_|. Trying to handle the failure by
getting a device id this way does not fall in line with the notion that the
device id should be unique and persistent across device attachments.

I would rather we just fail and have a UMA to keep track of how often this
occurs.

[kmadhusu, 2012/07/26 17:01:23]

Done.

+
+  LOG(ERROR) << "MOUNTING DEVICE ID: " << device_id_str << "\n";
+
   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