Revert of Move JoinString to the base namespace

ui/gfx/text_elider_unittest.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.
 //
 // Unit tests for eliding and formatting utility functions.
 
 #include "ui/gfx/text_elider.h"
 
 #include <vector>
 
@@ skipping 650 matching lines @@
   for (size_t i = 0; i < arraysize(cases); ++i) {
     std::vector<base::string16> lines;
     EXPECT_EQ(cases[i].truncated_y ? INSUFFICIENT_SPACE_VERTICAL : 0,
               ElideRectangleText(UTF8ToUTF16(cases[i].input),
                                  font_list,
                                  cases[i].available_pixel_width,
                                  cases[i].available_pixel_height,
                                  TRUNCATE_LONG_WORDS,
                                  &lines));
     if (cases[i].output) {
-      const std::string result =
-          UTF16ToUTF8(base::JoinString(lines, ASCIIToUTF16("|")));
+      const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
       EXPECT_EQ(cases[i].output, result) << "Case " << i << " failed!";
     } else {
       EXPECT_TRUE(lines.empty()) << "Case " << i << " failed!";
     }
   }
 }
 
 // TODO(338784): Enable this on android.
 #if defined(OS_ANDROID)
 #define MAYBE_ElideRectangleTextPunctuation \
@@ skipping 26 matching lines @@
     const WordWrapBehavior wrap_behavior =
         (cases[i].wrap_words ? WRAP_LONG_WORDS : TRUNCATE_LONG_WORDS);
     EXPECT_EQ(cases[i].truncated_x ? INSUFFICIENT_SPACE_HORIZONTAL : 0,
               ElideRectangleText(UTF8ToUTF16(cases[i].input),
                                  font_list,
                                  cases[i].available_pixel_width,
                                  cases[i].available_pixel_height,
                                  wrap_behavior,
                                  &lines));
     if (cases[i].output) {
-      const std::string result =
-          UTF16ToUTF8(base::JoinString(lines, base::ASCIIToUTF16("|")));
+      const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
       EXPECT_EQ(cases[i].output, result) << "Case " << i << " failed!";
     } else {
       EXPECT_TRUE(lines.empty()) << "Case " << i << " failed!";
     }
   }
 }
 
 // TODO(338784): Enable this on android.
 #if defined(OS_ANDROID)
 #define MAYBE_ElideRectangleTextLongWords DISABLED_ElideRectangleTextLongWords
@@ skipping 48 matching lines @@
     std::vector<base::string16> lines;
     EXPECT_EQ(cases[i].truncated_x ? INSUFFICIENT_SPACE_HORIZONTAL : 0,
               ElideRectangleText(UTF8ToUTF16(cases[i].input),
                                  font_list,
                                  cases[i].available_pixel_width,
                                  kAvailableHeight,
                                  cases[i].wrap_behavior,
                                  &lines));
     std::string expected_output(cases[i].output);
     base::ReplaceSubstringsAfterOffset(&expected_output, 0, "...", kEllipsis);
-    const std::string result =
-        UTF16ToUTF8(base::JoinString(lines, base::ASCIIToUTF16("|")));
+    const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
     EXPECT_EQ(expected_output, result) << "Case " << i << " failed!";
   }
 }
 
 // This test is to make sure that the width of each wrapped line does not
 // exceed the available width. On some platform like Mac, this test used to
 // fail because the truncated integer width is returned for the string
 // and the accumulation of the truncated values causes the elide function
 // to wrap incorrectly.
 // TODO(338784): Enable this on android.
@@ skipping 313 matching lines @@
   // Test adds ... at right spot within a word.
   EXPECT_EQ(L"f\x2026", UTF16ToWide(TruncateString(string, 2,
                                                    CHARACTER_BREAK)));
 
   // Test removes trailing whitespace if break falls between words.
   EXPECT_EQ(L"foooooey\x2026", UTF16ToWide(TruncateString(string, 12,
                                                           CHARACTER_BREAK)));
 }
 
 }  // namespace gfx