Revert of Move JoinString to the base namespace

android_webview/native/aw_web_contents_delegate.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 "android_webview/native/aw_web_contents_delegate.h"
 
 #include "android_webview/browser/aw_javascript_dialog_manager.h"
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/native/aw_contents.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/permission/media_access_permission_request.h"
 #include "android_webview/native/permission/permission_request_handler.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/common/media_stream_request.h"
 #include "jni/AwWebContentsDelegate_jni.h"
 #include "net/base/escape.h"
 
 using base::android::AttachCurrentThread;
@@ skipping 78 matching lines @@
     return;
   } else {
     DCHECK_EQ(FileChooserParams::Open, params.mode);
   }
   Java_AwWebContentsDelegate_runFileChooser(env,
       java_delegate.obj(),
       web_contents->GetRenderProcessHost()->GetID(),
       web_contents->GetRenderViewHost()->GetRoutingID(),
       mode_flags,
       ConvertUTF16ToJavaString(env,
-          base::JoinString(params.accept_types, base::ASCIIToUTF16(","))).obj(),
+        JoinString(params.accept_types, ',')).obj(),
       params.title.empty() ? NULL :
           ConvertUTF16ToJavaString(env, params.title).obj(),
       params.default_file_name.empty() ? NULL :
           ConvertUTF8ToJavaString(env, params.default_file_name.value()).obj(),
       params.capture);
 }
 
 void AwWebContentsDelegate::AddNewContents(WebContents* source,
                                            WebContents* new_contents,
                                            WindowOpenDisposition disposition,
@@ skipping 158 matching lines @@
   }
   FileChooserParams::Mode mode;
   if (mode_flags & kFileChooserModeOpenFolder) {
     mode = FileChooserParams::UploadFolder;
   } else if (mode_flags & kFileChooserModeOpenMultiple) {
     mode = FileChooserParams::OpenMultiple;
   } else {
     mode = FileChooserParams::Open;
   }
   DVLOG(0) << "File Chooser result: mode = " << mode
-           << ", file paths = " << base::JoinString(file_path_str, ":");
+           << ", file paths = " << JoinString(file_path_str, ":");
   rvh->FilesSelectedInChooser(files, mode);
 }
 
 bool RegisterAwWebContentsDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview