Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm

Index: chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm
===================================================================
--- chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm	(revision 218837)
+++ chrome/browser/storage_monitor/storage_monitor_mac_unittest.mm	(working copy)
@@ -30,10 +30,9 @@
     const std::string& model_name,
     const base::FilePath& mount_point,
     uint64 size_bytes) {
-  return StorageInfo(
-      device_id, string16(), mount_point.value(),
-      string16(), string16(), UTF8ToUTF16(model_name),
-      size_bytes);
+  return StorageInfo(device_id, mount_point.value(), base::string16(),
+                     base::string16(), base::UTF8ToUTF16(model_name),
+                     size_bytes);
 }
 
 }  // namespace
@@ -95,7 +94,6 @@
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
   EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point_.value(),
             mock_storage_observer_->last_attached().location());
 
@@ -112,7 +110,6 @@
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
   EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(kTestSize,
             mock_storage_observer_->last_attached().total_size_in_bytes());
   EXPECT_EQ(mount_point_.value(),
@@ -127,7 +124,6 @@
   EXPECT_EQ(device_id_, mock_storage_observer_->last_detached().device_id());
   EXPECT_EQ(2, mock_storage_observer_->attach_calls());
   EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(kTestSize * 2,
             mock_storage_observer_->last_attached().total_size_in_bytes());
   EXPECT_EQ(mount_point_.value(),
@@ -150,7 +146,6 @@
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
   EXPECT_EQ(device_id, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point.value(),
             mock_storage_observer_->last_attached().location());
 }
@@ -161,7 +156,6 @@
   EXPECT_EQ(1, mock_storage_observer_->attach_calls());
   EXPECT_EQ(0, mock_storage_observer_->detach_calls());
   EXPECT_EQ(device_id_, mock_storage_observer_->last_attached().device_id());
-  EXPECT_EQ(string16(), mock_storage_observer_->last_attached().name());
   EXPECT_EQ(mount_point_.value(),
             mock_storage_observer_->last_attached().location());
 
@@ -169,7 +163,6 @@
   EXPECT_TRUE(monitor_->GetStorageInfoForPath(mount_point_.AppendASCII("foo"),
                                               &info));
   EXPECT_EQ(device_id_, info.device_id());
-  EXPECT_EQ(string16(), info.name());
   EXPECT_EQ(mount_point_.value(), info.location());
   EXPECT_EQ(kTestSize, info.total_size_in_bytes());