[StorageMonitor] Move gallery name generation to StorageInfo.

chrome/browser/extensions/api/media_galleries_private/media_galleries_private_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/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "components/storage_monitor/test_storage_monitor.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #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;
 using storage_monitor::TestStorageMonitor;
 
 namespace {
 
 // Id of test extension from
 // chrome/test/data/extensions/api_test/|kTestExtensionPath|
 const char kTestExtensionId[] = "lkegdcleigedmkiikoijjgfchobofdbe";
@@ skipping 12 matching lines @@
 const char kAddDummyDetachListenerOk[] = "add_dummy_detach_ok";
 const char kRemoveAttachListenerOk[] = "remove_attach_ok";
 const char kRemoveDummyDetachListenerOk[] = "remove_dummy_detach_ok";
 
 // Test reply messages.
 const char kAttachTestOk[] = "attach_test_ok";
 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
 
 class MediaGalleriesPrivateApiTest : public ExtensionApiTest {
  public:
   MediaGalleriesPrivateApiTest() {}
   virtual ~MediaGalleriesPrivateApiTest() {}
 
   // ExtensionApiTest overrides.
@@ skipping 20 matching lines @@
     EXPECT_TRUE(listener.WaitUntilSatisfied());
   }
 
   void AttachDetach() {
     Attach();
     Detach();
   }
 
   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();
   }
 
   void Detach() {
     DCHECK(StorageMonitor::GetInstance()->IsInitialized());
     StorageMonitor::GetInstance()->receiver()->ProcessDetach(device_id_);
     content::RunAllPendingInMessageLoop();
   }
 
@@ skipping 26 matching lines @@
 
   // No listeners, attach and detach a couple times.
   AttachDetach();
   AttachDetach();
 
   // Add attach listener.
   ChangeListener(host, kAddAttachListenerCmd, kAddAttachListenerOk);
 
   // 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();
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
   Detach();
 
   // Attach / detach
   Attach();
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
   // Detach
@@ skipping 33 matching lines @@
   Attach();
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
   Detach();
   EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied());
 
   Attach();
   EXPECT_TRUE(attach_finished_listener.WaitUntilSatisfied());
   Detach();
   EXPECT_TRUE(detach_finished_listener.WaitUntilSatisfied());
 }