Media Galleries: Move gallery name generation back to StorageMonitor.

chrome/browser/extensions/api/media_galleries_private/media_galleries_eject_apitest.cc

 // Copyright (c) 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.
 //
 // MediaGalleriesPrivate eject API browser tests.
 
 #include "base/files/file_path.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 71 matching lines @@
   void ExecuteCmdAndCheckReply(content::RenderViewHost* host,
                                const std::string& js_command,
                                const std::string& ok_message) {
     ExtensionTestMessageListener listener(ok_message, false);
     host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(js_command));
     EXPECT_TRUE(listener.WaitUntilSatisfied());
   }
 
   void Attach() {
     DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
-    chrome::StorageInfo info(device_id_, ASCIIToUTF16(kDeviceName), kDevicePath,
-                             string16(), string16(), string16(), 0);
+    chrome::StorageInfo info(device_id_, kDevicePath,
+                             base::ASCIIToUTF16(kDeviceName), base::string16(),

[vandebo (ex-Chrome), 2013/07/23 23:28:55]

Is this to make the devices distinguishable or something?

[Lei Zhang, 2013/07/24 05:13:34]

Yes, for removable devices, the storage label field has similar effects as the
name field did previously. If we never put in |kDeviceName| somewhere, how can
we test for it later in JS?

+                             base::string16(), 0);
     chrome::StorageMonitor::GetInstance()->receiver()->ProcessAttach(info);
     content::RunAllPendingInMessageLoop();
   }
 
   void Detach() {
     DCHECK(chrome::StorageMonitor::GetInstance()->IsInitialized());
     chrome::StorageMonitor::GetInstance()->receiver()->ProcessDetach(
         device_id_);
     content::RunAllPendingInMessageLoop();
   }
@@ skipping 33 matching lines @@
   EXPECT_EQ(device_id_, monitor_->ejected_device());
 
   Detach();
 }
 
 IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateEjectApiTest, EjectBadDeviceTest) {
   ExecuteCmdAndCheckReply(GetHost(), kEjectFailTestCmd, kEjectFailListenerOk);
 
   EXPECT_EQ("", monitor_->ejected_device());
 }