Revert of Move JoinString to the base namespace

ui/message_center/views/bounded_label.cc

 // Copyright 2013 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/message_center/views/bounded_label.h"
 
 #include <limits>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 95 matching lines @@
   if (width == 0 || lines == 0)
     return gfx::Size();
   std::pair<int, int> key(width, lines);
   gfx::Size size = GetCachedSize(key);
   if (size.height() == std::numeric_limits<int>::max()) {
     gfx::Insets insets = owner_->GetInsets();
     int text_width = (width < 0) ? std::numeric_limits<int>::max() :
                                    std::max(width - insets.width(), 0);
     int text_height = std::numeric_limits<int>::max();
     std::vector<base::string16> wrapped = GetWrappedText(text_width, lines);
-    gfx::Canvas::SizeStringInt(
-        base::JoinString(wrapped, base::ASCIIToUTF16("\n")),
-        font_list(), &text_width, &text_height, owner_->GetLineHeight(),
-        GetTextFlags());
+    gfx::Canvas::SizeStringInt(JoinString(wrapped, '\n'), font_list(),
+                               &text_width, &text_height,
+                               owner_->GetLineHeight(),
+                               GetTextFlags());
     size.set_width(text_width + insets.width());
     size.set_height(text_height + insets.height());
     SetCachedSize(key, size);
   }
   return size;
 }
 
 std::vector<base::string16> InnerBoundedLabel::GetWrappedText(int width,
                                                               int lines) {
   // Short circuit simple case.
@@ skipping 40 matching lines @@
 
 void InnerBoundedLabel::OnPaint(gfx::Canvas* canvas) {
   views::Label::OnPaintBackground(canvas);
   views::Label::OnPaintBorder(canvas);
   int lines = owner_->GetLineLimit();
   int height = GetSizeForWidthAndLines(width(), lines).height();
   if (height > 0) {
     gfx::Rect bounds(width(), height);
     bounds.Inset(owner_->GetInsets());
     if (bounds.width() != wrapped_text_width_ || lines != wrapped_text_lines_) {
-      wrapped_text_ = base::JoinString(GetWrappedText(bounds.width(), lines),
-                                       base::ASCIIToUTF16("\n"));
+      wrapped_text_ = JoinString(GetWrappedText(bounds.width(), lines), '\n');
       wrapped_text_width_ = bounds.width();
       wrapped_text_lines_ = lines;
     }
     bounds.set_x(GetMirroredXForRect(bounds));
     canvas->DrawStringRectWithFlags(
         wrapped_text_, font_list(), enabled_color(), bounds, GetTextFlags());
   }
 }
 
 void InnerBoundedLabel::SetText(const base::string16& new_text) {
@@ skipping 145 matching lines @@
 void BoundedLabel::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   label_->SetBoundsRect(bounds());
   views::View::OnBoundsChanged(previous_bounds);
 }
 
 void BoundedLabel::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   label_->SetNativeTheme(theme);
 }
 
 base::string16 BoundedLabel::GetWrappedTextForTest(int width, int lines) {
-  return base::JoinString(label_->GetWrappedText(width, lines),
-                          base::ASCIIToUTF16("\n"));
+  return JoinString(label_->GetWrappedText(width, lines), '\n');
 }
 
 }  // namespace message_center