Media Galleries: Move gallery name generation back to StorageMonitor.

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_system.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.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 "url/gurl.h"
 
 namespace {
 
 // Id of test extension from
 // chrome/test/data/extensions/api_test/|kTestExtensionPath|
 const char kTestExtensionId[] = "lkegdcleigedmkiikoijjgfchobofdbe";
 const char kTestExtensionPath[] = "media_galleries_private/attachdetach";
 
 // JS commands.
 const char kAddAttachListenerCmd[] = "addAttachListener()";
@@ skipping 48 matching lines @@
     EXPECT_TRUE(listener.WaitUntilSatisfied());
   }
 
   void AttachDetach() {
     Attach();
     Detach();
   }
 
   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(),
+                             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 73 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());
 }