[Media Gallery][ChromeOS] Improve device media gallery names.

chromeos/disks/mock_disk_mount_manager.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.
 
 #include "chromeos/disks/mock_disk_mount_manager.h"
 
 #include <utility>
 
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 165 matching lines @@
       .Times(AnyNumber());
   EXPECT_CALL(*this, FormatMountedDevice(_))
       .Times(AnyNumber());
   EXPECT_CALL(*this, UnmountDeviceRecursive(_, _, _))
       .Times(AnyNumber());
 }
 
 void MockDiskMountManager::CreateDiskEntryForMountDevice(
     const DiskMountManager::MountPointInfo& mount_info,
     const std::string& device_id,
-    const std::string& device_label) {
+    const std::string& device_label,
+    const std::string& vendor_name,
+    const std::string& product_name,
+    DeviceType device_type,
+    uint64 total_size_in_bytes) {
   Disk* disk = new DiskMountManager::Disk(std::string(mount_info.source_path),
                                           std::string(mount_info.mount_path),
                                           std::string(),  // system_path
                                           std::string(),  // file_path
                                           device_label,  // device_label
                                           std::string(),  // drive_label
                                           std::string(),  // vendor_id
-                                          std::string(),  // vendor_name
+                                          vendor_name,
                                           std::string(),  // product_id
-                                          std::string(),  // product_name
+                                          product_name,
                                           device_id,  // fs_uuid
                                           std::string(),  // system_path_prefix
-                                          DEVICE_TYPE_USB,  // device_type
-                                          1073741824,  // total_size_in_bytes
+                                          device_type,
+                                          total_size_in_bytes,
                                           false,  // is_parent
                                           false,  // is_read_only
                                           true,  // has_media
                                           false,  // on_boot_device
                                           false);  // is_hidden

[oshima, 2012/11/13 23:57:10]

Wow, this argument list is way too long. Probably not your fault, but please
consider re-organize them as more structured arguments when you have a chance.

[kmadhusu, 2012/11/14 00:33:37]

Sure. Will do.

   DiskMountManager::DiskMap::iterator it = disks_.find(mount_info.source_path);
   if (it == disks_.end()) {
     disks_.insert(std::make_pair(std::string(mount_info.source_path), disk));
   } else {
     delete it->second;
     it->second = disk;
   }
 }
 
 void MockDiskMountManager::RemoveDiskEntryForMountDevice(
@@ skipping 23 matching lines @@
   FOR_EACH_OBSERVER(Observer, observers_, DiskChanged(event, disk));
 }
 
 void MockDiskMountManager::NotifyDeviceChanged(DiskMountManagerEventType event,
                                                const std::string& path) {
   FOR_EACH_OBSERVER(Observer, observers_, DeviceChanged(event, path));
 }
 
 }  // namespace disks
 }  // namespace chromeos