Revert of Move JoinString to the base namespace

ui/gl/gl_gl_api_implementation.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 "ui/gl/gl_gl_api_implementation.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 474 matching lines @@
 
     // Filter out extensions from the command line.
     for (const std::string& disabled_ext : disabled_exts_) {
       filtered_exts_.erase(std::remove(filtered_exts_.begin(),
                                        filtered_exts_.end(),
                                        disabled_ext),
                            filtered_exts_.end());
     }
 
     // Construct filtered extensions string for GL_EXTENSIONS string lookups.
-    filtered_exts_str_ = base::JoinString(filtered_exts_, " ");
+    filtered_exts_str_ = JoinString(filtered_exts_, " ");
   }
 }
 
 TraceGLApi::~TraceGLApi() {
 }
 
 NoContextGLApi::NoContextGLApi() {
 }
 
 NoContextGLApi::~NoContextGLApi() {
@@ skipping 17 matching lines @@
       ext_string, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
 
   std::vector<std::string>::iterator it;
   // We can't support GL_EXT_occlusion_query_boolean which is
   // based on GL_ARB_occlusion_query without a lot of work virtualizing
   // queries.
   it = std::find(ext.begin(), ext.end(), "GL_EXT_occlusion_query_boolean");
   if (it != ext.end())
     ext.erase(it);
 
-  extensions_ = base::JoinString(ext, " ");
+  extensions_ = JoinString(ext, " ");
 }
 
 bool VirtualGLApi::MakeCurrent(GLContext* virtual_context, GLSurface* surface) {
   bool switched_contexts = g_current_gl_context_tls->Get() != this;
   GLSurface* current_surface = GLSurface::GetCurrent();
   if (switched_contexts || surface != current_surface) {
     // MakeCurrent 'lite' path that avoids potentially expensive MakeCurrent()
     // calls if the GLSurface uses the same underlying surface or renders to
     // an FBO.
     if (switched_contexts || !current_surface ||
@@ skipping 69 matching lines @@
 ScopedSetGLToRealGLApi::ScopedSetGLToRealGLApi()
     : old_gl_api_(GetCurrentGLApi()) {
   SetGLToRealGLApi();
 }
 
 ScopedSetGLToRealGLApi::~ScopedSetGLToRealGLApi() {
   SetGLApi(old_gl_api_);
 }
 
 }  // namespace gfx