[StorageMonitor] Move gallery name generation to StorageInfo.

components/storage_monitor/storage_monitor_chromeos_unittest.cc

 // Copyright 2014 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 "components/storage_monitor/storage_monitor_chromeos.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 316 matching lines @@
               mount_info,
               kUniqueId,
               kDevice1Name,
               kVendorName,
               kProductName,
               chromeos::DEVICE_TYPE_USB,
               kDevice1SizeInBytes);
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(device_id, observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path.value(), observer().last_attached().location());
 }
 
 // Non device mounts and mount errors are ignored.
 TEST_F(StorageMonitorCrosTest, Ignore) {
   testing::Sequence mock_sequence;
   base::FilePath mount_path = CreateMountPoint(kMountPointA, true);
   const std::string kUniqueId = "FFFF-FFFF";
   ASSERT_FALSE(mount_path.empty());
 
@@ skipping 56 matching lines @@
               kUniqueId2,
               kSDCardDeviceName1,
               kVendorName,
               kProductName,
               chromeos::DEVICE_TYPE_SD,
               kSDCardSizeInBytes);
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path1.value(), observer().last_attached().location());
 
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info1);
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(1, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),
             observer().last_detached().device_id());
 
   base::FilePath mount_path2 = CreateMountPoint(kSDCardMountPoint2, true);
   ASSERT_FALSE(mount_path2.empty());
   DiskMountManager::MountPointInfo mount_info2(
       kSDCardDeviceName2,
       mount_path2.value(),
       chromeos::MOUNT_TYPE_DEVICE,
       chromeos::disks::MOUNT_CONDITION_NONE);
   MountDevice(chromeos::MOUNT_ERROR_NONE,
               mount_info2,
               kUniqueId2,
               kSDCardDeviceName2,
               kVendorName,
               kProductName,
               chromeos::DEVICE_TYPE_SD,
               kSDCardSizeInBytes);
   EXPECT_EQ(2, observer().attach_calls());
   EXPECT_EQ(1, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path2.value(), observer().last_attached().location());
 
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info2);
   EXPECT_EQ(2, observer().attach_calls());
   EXPECT_EQ(2, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId2),
             observer().last_detached().device_id());
 }
 
 TEST_F(StorageMonitorCrosTest, AttachDeviceWithEmptyLabel) {
   base::FilePath mount_path1 = CreateMountPoint(kMountPointA, true);
   ASSERT_FALSE(mount_path1.empty());
   DiskMountManager::MountPointInfo mount_info(
       kEmptyDeviceLabel,
       mount_path1.value(),
       chromeos::MOUNT_TYPE_DEVICE,
       chromeos::disks::MOUNT_CONDITION_NONE);
   MountDevice(chromeos::MOUNT_ERROR_NONE,
               mount_info,
               kUniqueId1,
               kEmptyDeviceLabel,
               kVendorName,
               kProductName,
               chromeos::DEVICE_TYPE_USB,
               kDevice1SizeInBytes);
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path1.value(), observer().last_attached().location());
 
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info);
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(1, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),
             observer().last_detached().device_id());
 }
 
 TEST_F(StorageMonitorCrosTest, GetStorageSize) {
   base::FilePath mount_path1 = CreateMountPoint(kMountPointA, true);
   ASSERT_FALSE(mount_path1.empty());
   DiskMountManager::MountPointInfo mount_info(
       kEmptyDeviceLabel,
       mount_path1.value(),
       chromeos::MOUNT_TYPE_DEVICE,
       chromeos::disks::MOUNT_CONDITION_NONE);
   MountDevice(chromeos::MOUNT_ERROR_NONE,
               mount_info,
               kUniqueId1,
               kEmptyDeviceLabel,
               kVendorName,
               kProductName,
               chromeos::DEVICE_TYPE_USB,
               kDevice1SizeInBytes);
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),
             observer().last_attached().device_id());
-  EXPECT_EQ(base::string16(), observer().last_attached().name());
   EXPECT_EQ(mount_path1.value(), observer().last_attached().location());
 
   EXPECT_EQ(kDevice1SizeInBytes, GetDeviceStorageSize(mount_path1.value()));
   UnmountDevice(chromeos::MOUNT_ERROR_NONE, mount_info);
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(1, observer().detach_calls());
   EXPECT_EQ(GetDCIMDeviceId(kUniqueId1),
             observer().last_detached().device_id());
 }
 
@@ skipping 30 matching lines @@
                         base::Bind(&StorageMonitorCrosTest::EjectNotify,
                                    base::Unretained(this)));
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(StorageMonitor::EJECT_OK, status_);
 }
 
 }  // namespace
 
 }  // namespace storage_monitor