[StorageMonitor] Move gallery name generation to StorageInfo.

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

Index: chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc
index a2511b12877c6bffb77bbbe588f453d4afb1d5a7..10b94c84b82beeb0f0993489d24504db8daadb4b 100644
--- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc
@@ -19,7 +19,6 @@
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
-#include "url/gurl.h"
 
 using storage_monitor::StorageInfo;
 using storage_monitor::StorageMonitor;
@@ -52,7 +51,7 @@ const char kDetachTestOk[] = "detach_test_ok";
 
 // Dummy device properties.
 const char kDeviceId[] = "testDeviceId";
-const char kDeviceName[] = "foobar";
+const char kVolumeLabel[] = "foobar";
 base::FilePath::CharType kDevicePath[] = FILE_PATH_LITERAL("/qux");
 
 }  // namespace
@@ -93,8 +92,9 @@ class MediaGalleriesPrivateApiTest : public ExtensionApiTest {
 
   void Attach() {
     DCHECK(StorageMonitor::GetInstance()->IsInitialized());
-    StorageInfo info(device_id_, base::ASCIIToUTF16(kDeviceName), kDevicePath,
-                     base::string16(), base::string16(), base::string16(), 0);
+    const StorageInfo info(device_id_, kDevicePath,
+                           base::ASCIIToUTF16(kVolumeLabel), base::string16(),
+                           base::string16(), 0);
     StorageMonitor::GetInstance()->receiver()->ProcessAttach(info);
     content::RunAllPendingInMessageLoop();
   }
@@ -141,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(MediaGalleriesPrivateApiTest,
 
   // Attach / detach
   const std::string expect_attach_msg =
-      base::StringPrintf("%s,%s", kAttachTestOk, kDeviceName);
+      base::StringPrintf("%s,%s", kAttachTestOk, kVolumeLabel);
   ExtensionTestMessageListener attach_finished_listener(expect_attach_msg,
                                                         false  /* no reply */);
   Attach();