Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc

 // Copyright 2013 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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 96 matching lines @@
   // as construction.
   test::TestStorageMonitor::RemoveSingleton();
 
   ChromeRenderViewHostTestHarness::TearDown();
 }
 
 void MTPDeviceDelegateImplWinTest::ProcessAttach(
     const std::string& id,
     const string16& label,
     const base::FilePath::StringType& location) {
-  StorageInfo info(id, string16(), location, label, string16(), string16(), 0);
+  StorageInfo info(id, location, label, base::string16(), base::string16(), 0);
   monitor_->receiver()->ProcessAttach(info);
 }
 
 std::string MTPDeviceDelegateImplWinTest::AttachDevice(
     StorageInfo::Type type,
     const std::string& unique_id,
     const base::FilePath& location) {
   std::string device_id = StorageInfo::MakeDeviceId(type, unique_id);
   DCHECK(StorageInfo::IsRemovableDevice(device_id));
   string16 label = location.LossyDisplayName();
@@ skipping 42 matching lines @@
     if (info.path == location) {
       CheckGalleryInfo(info, location.LossyDisplayName(), location, true, true);
       checked = true;
       break;
     }
   }
   EXPECT_TRUE(checked);
 }
 
 }  // namespace chrome