Revert of Move JoinString to the base namespace

chrome/test/base/web_ui_browser_test.cc

 // Copyright 2014 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 "chrome/test/base/web_ui_browser_test.h"
 
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/web_ui_test_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/test_chrome_web_ui_controller_factory.h"
@@ skipping 387 matching lines @@
     bool is_async,
     RenderViewHost* preload_host) {
   // Get the user libraries. Preloading them individually is best, then
   // we can assign each one a filename for better stack traces. Otherwise
   // append them all to |content|.
   base::string16 content;
   std::vector<base::string16> libraries;
   if (!libraries_preloaded_) {
     BuildJavascriptLibraries(&libraries);
     if (!preload_host) {
-      content = base::JoinString(libraries, base::ASCIIToUTF16("\n"));
+      content = JoinString(libraries, '\n');
       libraries.clear();
     }
   }
 
   if (!function_name.empty()) {
     base::string16 called_function;
     if (is_test) {
       called_function =
           BuildRunTestJSCall(is_async, function_name, function_arguments);
     } else {
@@ skipping 43 matching lines @@
 }
 
 GURL WebUIBrowserTest::WebUITestDataPathToURL(
     const base::FilePath::StringType& path) {
   base::FilePath dir_test_data;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &dir_test_data));
   base::FilePath test_path(dir_test_data.Append(kWebUITestFolder).Append(path));
   EXPECT_TRUE(base::PathExists(test_path));
   return net::FilePathToFileURL(test_path);
 }