Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc

Index: chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc
===================================================================
--- chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc	(revision 218837)
+++ chrome/browser/storage_monitor/storage_monitor_linux_unittest.cc	(working copy)
@@ -91,7 +91,6 @@
   StorageInfo::Type type = kTestDeviceData[i].type;
   storage_info.reset(new StorageInfo(
       StorageInfo::MakeDeviceId(type, kTestDeviceData[i].unique_id),
-      string16(),
       mount_point.value(),
       ASCIIToUTF16("volume label"),
       ASCIIToUTF16("vendor name"),
@@ -346,7 +345,6 @@
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDeviceId(kDeviceDCIM2), observer().last_attached().device_id());
-  EXPECT_EQ(string16(), observer().last_attached().name());
   EXPECT_EQ(test_path.value(), observer().last_attached().location());
 
   // |kDeviceDCIM2| should be detached here.
@@ -369,7 +367,6 @@
   EXPECT_EQ(1, observer().attach_calls());
   EXPECT_EQ(0, observer().detach_calls());
   EXPECT_EQ(GetDeviceId(kDeviceDCIM1), observer().last_attached().device_id());
-  EXPECT_EQ(string16(), observer().last_attached().name());
   EXPECT_EQ(test_path_a.value(), observer().last_attached().location());
 
   // This should do nothing, since |kDeviceFixed| is not removable.
@@ -396,7 +393,6 @@
   EXPECT_EQ(2, observer().attach_calls());
   EXPECT_EQ(1, observer().detach_calls());
   EXPECT_EQ(GetDeviceId(kDeviceNoDCIM), observer().last_attached().device_id());
-  EXPECT_EQ(string16(), observer().last_attached().name());
   EXPECT_EQ(test_path_b.value(), observer().last_attached().location());
 
   // |kDeviceNoDCIM| should be detached as expected.
@@ -623,7 +619,6 @@
   EXPECT_TRUE(notifier()->GetStorageInfoForPath(test_path_a, &device_info));
   EXPECT_EQ(GetDeviceId(kDeviceDCIM1), device_info.device_id());
   EXPECT_EQ(test_path_a.value(), device_info.location());
-  EXPECT_EQ(string16(), device_info.name());
   EXPECT_EQ(88788ULL, device_info.total_size_in_bytes());
   EXPECT_EQ(ASCIIToUTF16("volume label"), device_info.storage_label());
   EXPECT_EQ(ASCIIToUTF16("vendor name"), device_info.vendor_name());
@@ -632,12 +627,10 @@
   EXPECT_TRUE(notifier()->GetStorageInfoForPath(test_path_b, &device_info));
   EXPECT_EQ(GetDeviceId(kDeviceNoDCIM), device_info.device_id());
   EXPECT_EQ(test_path_b.value(), device_info.location());
-  EXPECT_EQ(string16(), device_info.name());
 
   EXPECT_TRUE(notifier()->GetStorageInfoForPath(test_path_c, &device_info));
   EXPECT_EQ(GetDeviceId(kDeviceFixed), device_info.device_id());
   EXPECT_EQ(test_path_c.value(), device_info.location());
-  EXPECT_EQ(string16(), device_info.name());
 
   // An invalid path.
   EXPECT_FALSE(notifier()->GetStorageInfoForPath(base::FilePath(kInvalidPath),
@@ -649,7 +642,6 @@
       &device_info));
   EXPECT_EQ(GetDeviceId(kDeviceDCIM1), device_info.device_id());
   EXPECT_EQ(test_path_a.value(), device_info.location());
-  EXPECT_EQ(string16(), device_info.name());
 
   // One device attached at multiple points.
   // kDeviceDCIM1 -> kMountPointA *