Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/storage_monitor/media_storage_util_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 27 matching lines @@
   // Verify mounted device type.
   void CheckDeviceType(const base::FilePath& mount_point,
                        bool expected_val) {
     if (expected_val)
       EXPECT_TRUE(MediaStorageUtil::HasDcim(mount_point));
     else
       EXPECT_FALSE(MediaStorageUtil::HasDcim(mount_point));
   }
 
   void ProcessAttach(const std::string& id,
-                     const string16& name,
                      const base::FilePath::StringType& location) {
-    StorageInfo info(id, name, location, string16(), string16(), string16(), 0);
+    StorageInfo info(id, location, base::string16(), base::string16(),
+                     base::string16(), 0);
     monitor_->receiver()->ProcessAttach(info);
   }
 
  protected:
   // Create mount point for the test device.
   base::FilePath CreateMountPoint(bool create_dcim_dir) {
     base::FilePath path(scoped_temp_dir_.path());
     if (create_dcim_dir)
       path = path.Append(kDCIMDirectoryName);
     if (!file_util::CreateDirectory(path))
@@ skipping 75 matching lines @@
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event));
 
   // We need signal_event to be executed on the FILE thread, as the test thread
   // is blocked. Therefore, we invoke FilterAttachedDevices on the FILE thread.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&MediaStorageUtil::FilterAttachedDevices,
                                      base::Unretained(&devices), signal_event));
   event.Wait();
   EXPECT_FALSE(devices.find(kImageCaptureDeviceId) != devices.end());
 
-  ProcessAttach(kImageCaptureDeviceId, ASCIIToUTF16("name"),
-                FILE_PATH_LITERAL("/location"));
+  ProcessAttach(kImageCaptureDeviceId, FILE_PATH_LITERAL("/location"));
   devices.insert(kImageCaptureDeviceId);
   event.Reset();
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&MediaStorageUtil::FilterAttachedDevices,
                                      base::Unretained(&devices), signal_event));
   event.Wait();
 
   EXPECT_TRUE(devices.find(kImageCaptureDeviceId) != devices.end());
 }
 
 }  // namespace chrome