Revert of Move JoinString to the base namespace

content/browser/accessibility/accessibility_tree_formatter_utils_win.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 "content/browser/accessibility/accessibility_tree_formatter_utils_win.h"
 
 #include <oleacc.h>
 
 #include <map>
 #include <string>
 
 #include "base/memory/singleton.h"
 #include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
 #include "third_party/iaccessible2/ia2_api_all.h"
 
 namespace content {
 namespace {
 
 class AccessibilityEnumMap {
  public:
   static AccessibilityEnumMap* GetInstance();
 
   std::map<int32, base::string16> ia_role_string_map;
@@ skipping 283 matching lines @@
   std::map<int32, base::string16>::const_iterator it;
   for (it = state_string_map.begin(); it != state_string_map.end(); ++it) {
     if (it->first & ia_state)
       result->push_back(it->second);
   }
 }
 
 base::string16 IAccessibleStateToString(int32 ia_state) {
   std::vector<base::string16> strings;
   IAccessibleStateToStringVector(ia_state, &strings);
-  return base::JoinString(strings, base::ASCIIToUTF16(","));
+  return JoinString(strings, ',');
 }
 
 void IAccessible2StateToStringVector(int32 ia2_state,
                                      std::vector<base::string16>* result) {
   const std::map<int32, base::string16>& state_string_map =
       AccessibilityEnumMap::GetInstance()->ia2_state_string_map;
   std::map<int32, base::string16>::const_iterator it;
   for (it = state_string_map.begin(); it != state_string_map.end(); ++it) {
     if (it->first & ia2_state)
       result->push_back(it->second);
   }
 }
 
 base::string16 IAccessible2StateToString(int32 ia2_state) {
   std::vector<base::string16> strings;
   IAccessible2StateToStringVector(ia2_state, &strings);
-  return base::JoinString(strings, base::ASCIIToUTF16(","));
+  return JoinString(strings, ',');
 }
 
 base::string16 AccessibilityEventToString(int32 event_id) {
   return AccessibilityEnumMap::GetInstance()->event_string_map[event_id];
 }
 
 }  // namespace content