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

chrome/browser/chromeos/disks/mock_disk_mount_manager.cc

Index: chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
diff --git a/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc b/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
index 80558e0dc797bba5c9dd382535405c65f5c66720..a7151dfca76a4a26e205a018315c25109a43114a 100644
--- a/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
+++ b/chrome/browser/chromeos/disks/mock_disk_mount_manager.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/disks/mock_disk_mount_manager.h"
 
 #include "base/message_loop.h"
+#include "base/stl_util.h"
 #include "base/string_util.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -26,6 +27,7 @@ const char* kTestMountPath = "/media/foofoo";
 const char* kTestFilePath = "/this/file/path";
 const char* kTestDeviceLabel = "A label";
 const char* kTestDriveLabel = "Another label";
+const char* kTestUuid = "FFFF-FFFF";
 
 }  // namespace
 
@@ -50,6 +52,8 @@ MockDiskMountManager::MockDiskMountManager() {
 }
 
 MockDiskMountManager::~MockDiskMountManager() {
+  STLDeleteContainerPairSecondPointers(disks_.begin(), disks_.end());
+  disks_.clear();
 }
 
 void MockDiskMountManager::NotifyDeviceInsertEvents() {
@@ -60,6 +64,7 @@ void MockDiskMountManager::NotifyDeviceInsertEvents() {
       std::string(kTestFilePath),
       std::string(),
       std::string(kTestDriveLabel),
+      std::string(kTestUuid),
       std::string(kTestSystemPathPrefix),
       DEVICE_TYPE_USB,
       4294967295U,
@@ -90,6 +95,7 @@ void MockDiskMountManager::NotifyDeviceInsertEvents() {
       std::string(kTestFilePath),
       std::string(kTestDeviceLabel),
       std::string(kTestDriveLabel),
+      std::string(kTestUuid),

[Lei Zhang, 2012/07/30 22:11:32]

either this is correct and the change on line 121 is wrong, or vice versa.

Here we have: drive_label, uuid, system_path_prefix
below we have: uuid, drive_label, system_path_prefix

[kmadhusu, 2012/07/30 22:51:14]

oops. Good catch. Line 98 is correct. Fixed line 121.

       std::string(kTestSystemPathPrefix),
       DEVICE_TYPE_MOBILE,
       1073741824,
@@ -112,6 +118,7 @@ void MockDiskMountManager::NotifyDeviceRemoveEvents() {
       std::string(kTestSystemPath),
       std::string(kTestFilePath),
       std::string(kTestDeviceLabel),
+      std::string(kTestUuid),
       std::string(kTestDriveLabel),
       std::string(kTestSystemPathPrefix),
       DEVICE_TYPE_SD,
@@ -148,6 +155,37 @@ void MockDiskMountManager::SetupDefaultReplies() {
       .Times(AnyNumber());
 }
 
+void MockDiskMountManager::CreateDiskEntryForMountDevice(
+    const DiskMountManager::MountPointInfo& mount_info,
+    const std::string& device_id) {
+  Disk* disk =  new DiskMountManager::Disk(std::string(mount_info.source_path),

[Ben Chan, 2012/07/30 22:03:59]

nit: remove the extra space after =

[kmadhusu, 2012/07/30 22:51:14]

Done.

+                                           std::string(mount_info.mount_path),
+                                           std::string(),

[Ben Chan, 2012/07/30 22:03:59]

nit: comment what these empty strings are

[kmadhusu, 2012/07/30 22:51:14]

Done.

+                                           std::string(),
+                                           std::string(),
+                                           std::string(),
+                                           std::string(device_id),

[Ben Chan, 2012/07/30 22:03:59]

std::string(device_id) -> device_id

[kmadhusu, 2012/07/30 22:51:14]

Done.

+                                           std::string(),
+                                           DEVICE_TYPE_USB,
+                                           1073741824,
+                                           false,  // is_parent
+                                           false,  // is_read_only
+                                           true,  // has_media
+                                           false,  // on_boot_device
+                                           false);  // is_hidden
+  disks_.insert(std::pair<std::string, DiskMountManager::Disk*>(
+      std::string(mount_info.source_path), disk));
+}
+
+void MockDiskMountManager::RemoveDiskEntryForMountDevice(
+    const DiskMountManager::MountPointInfo& mount_info) {
+  DiskMountManager::DiskMap::iterator it = disks_.find(mount_info.source_path);
+  if (it != disks_.end()) {
+    delete it->second;
+    disks_.erase(it);
+  }
+}
+
 void MockDiskMountManager::NotifyDiskChanged(DiskMountManagerEventType event,
                                              const DiskMountManager::Disk* disk)
 {