[StorageMonitor] Move gallery name generation to StorageInfo.

components/storage_monitor/storage_monitor_mac_unittest.mm

 // 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_mac.h"
 
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/foundation_util.h"
@@ skipping 13 matching lines @@
 namespace storage_monitor {
 
 namespace {
 
 StorageInfo CreateStorageInfo(
     const std::string& device_id,
     const std::string& model_name,
     const base::FilePath& mount_point,
     uint64 size_bytes) {
   return StorageInfo(
-      device_id, base::string16(), mount_point.value(),
-      base::string16(), base::string16(), base::UTF8ToUTF16(model_name),
-      size_bytes);
+      device_id, mount_point.value(), base::string16(), base::string16(),
+      base::UTF8ToUTF16(model_name), size_bytes);
 }
 
 }  // namespace
 
 class StorageMonitorMacTest : public testing::Test {
  public:
   StorageMonitorMacTest() {}
 
   virtual void SetUp() OVERRIDE {
     monitor_.reset(new StorageMonitorMac);
@@ skipping 121 matching lines @@
 
 // Test that mounting a DMG doesn't send a notification.
 TEST_F(StorageMonitorMacTest, DMG) {
   StorageInfo info = CreateStorageInfo(
       device_id_, "Disk Image", mount_point_, kTestSize);
   UpdateDisk(info, StorageMonitorMac::UPDATE_DEVICE_ADDED);
   EXPECT_EQ(0, mock_storage_observer_->attach_calls());
 }
 
 }  // namespace storage_monitor