Media Galleries: Move gallery name generation back to StorageMonitor.

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/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 45 matching lines @@
     ResultCatcher catcher;
     host->render_view_host()->ExecuteJavascriptInWebFrame(string16(), command);
     EXPECT_TRUE(catcher.GetNextResult()) << message_;
   }
 
   void AttachFakeDevice() {
     device_id_ = chrome::StorageInfo::MakeDeviceId(
         chrome::StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, kDeviceId);
 
     chrome::StorageMonitor::GetInstance()->receiver()->ProcessAttach(
-        chrome::StorageInfo(device_id_, string16(), kDevicePath,
-                            ASCIIToUTF16(kDeviceName),
-                            string16(), string16(), 0));
+        chrome::StorageInfo(device_id_, kDevicePath,
+                            base::ASCIIToUTF16(kDeviceName), base::string16(),
+                            base::string16(), 0));
     content::RunAllPendingInMessageLoop();
   }
 
   void DetachFakeDevice() {
     chrome::StorageMonitor::GetInstance()->receiver()->ProcessDetach(
         device_id_);
     content::RunAllPendingInMessageLoop();
   }
 
  private:
@@ skipping 45 matching lines @@
   chrome::EnsureMediaDirectoriesExists media_directories;
   ASSERT_TRUE(RunPlatformAppTest("api_test/media_galleries/metadata"))
       << message_;
 }
 
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesExperimentalApiTest,
                        ExperimentalMediaGalleries) {
   ASSERT_TRUE(RunExtensionTest("media_galleries/experimental")) << message_;
 }