Move JoinString to the base namespace

chrome/browser/ui/cocoa/global_error_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 64 matching lines @@
   [super awakeFromNib];
 
   DCHECK(error_);
 
   gfx::Image image = error_->GetBubbleViewIcon();
   DCHECK(!image.IsEmpty());
   [iconView_ setImage:image.ToNSImage()];
 
   [title_ setStringValue:SysUTF16ToNSString(error_->GetBubbleViewTitle())];
   std::vector<base::string16> messages = error_->GetBubbleViewMessages();
-  base::string16 message = JoinString(messages, '\n');
+  base::string16 message = base::JoinString(messages, base::ASCIIToUTF16("\n"));
 
   base::scoped_nsobject<NSMutableAttributedString> messageValue(
       [[NSMutableAttributedString alloc]
           initWithString:SysUTF16ToNSString(message)]);
   base::scoped_nsobject<NSMutableParagraphStyle> style(
       [[NSMutableParagraphStyle alloc] init]);
   [style setParagraphSpacing:kParagraphSpacing];
   [messageValue addAttribute:NSParagraphStyleAttributeName
                        value:style
                        range:NSMakeRange(0, [messageValue length])];
@@ skipping 57 matching lines @@
   [self close];
 }
 
 @end
 
 GlobalErrorBubbleViewBase* GlobalErrorBubbleViewBase::ShowStandardBubbleView(
     Browser* browser,
     const base::WeakPtr<GlobalErrorWithStandardBubble>& error) {
   return [GlobalErrorBubbleController showForBrowser:browser error:error];
 }