[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/extensions/api/media_galleries/media_galleries_apitest.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 "base/auto_reset.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_writer.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 151 matching lines @@
     bool result = RunPlatformAppTestWithArg(extension_name, custom_arg);
     content::RunAllPendingInMessageLoop();  // avoid race on exit in registry.
     return result;
   }
 
   void AttachFakeDevice() {
     device_id_ = StorageInfo::MakeDeviceId(
         StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, kDeviceId);
 
     StorageMonitor::GetInstance()->receiver()->ProcessAttach(
-        StorageInfo(device_id_, base::string16(), kDevicePath,
-                    base::ASCIIToUTF16(kDeviceName), base::string16(),
-                    base::string16(), 0));
+        StorageInfo(device_id_, kDevicePath, base::ASCIIToUTF16(kDeviceName),
+                    base::string16(), base::string16(), 0));
     content::RunAllPendingInMessageLoop();
   }
 
   void DetachFakeDevice() {
     StorageMonitor::GetInstance()->receiver()->ProcessDetach(device_id_);
     content::RunAllPendingInMessageLoop();
   }
 
   // Called if test only wants a single gallery it creates.
   void RemoveAllGalleries() {
@@ skipping 397 matching lines @@
 
   base::ListValue custom_args;
 #if defined(USE_PROPRIETARY_CODECS)
   custom_args.AppendBoolean(true);
 #else
   custom_args.AppendBoolean(false);
 #endif
   ASSERT_TRUE(RunMediaGalleriesTestWithArg("media_metadata", custom_args))
       << message_;
 }