Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

chrome/browser/ui/external_protocol_dialog_delegate.cc

 // Copyright (c) 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 "chrome/browser/ui/external_protocol_dialog_delegate.h"
 
 #include <string>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
@@ skipping 16 matching lines @@
 ExternalProtocolDialogDelegate::~ExternalProtocolDialogDelegate() {
 }
 
 base::string16 ExternalProtocolDialogDelegate::GetMessageText() const {
   const int kMaxUrlWithoutSchemeSize = 256;
   const int kMaxCommandSize = 256;
   // TODO(calamity): Look up the command in ExternalProtocolHandler and pass it
   // into the constructor. Will require simultaneous change of
   // ExternalProtocolHandler::RunExternalProtocolDialog across all platforms.
   base::string16 command =
-    UTF8ToUTF16(ShellIntegration::GetApplicationForProtocol(url()));
+    base::UTF8ToUTF16(ShellIntegration::GetApplicationForProtocol(url()));
   base::string16 elided_url_without_scheme;
   base::string16 elided_command;
-  gfx::ElideString(ASCIIToUTF16(url().possibly_invalid_spec()),
+  gfx::ElideString(base::ASCIIToUTF16(url().possibly_invalid_spec()),
                   kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
   gfx::ElideString(command, kMaxCommandSize, &elided_command);
 
   base::string16 message_text = l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_INFORMATION,
-      ASCIIToUTF16(url().scheme() + ":"),
-      elided_url_without_scheme) + ASCIIToUTF16("\n\n");
+      base::ASCIIToUTF16(url().scheme() + ":"),
+      elided_url_without_scheme) + base::ASCIIToUTF16("\n\n");
 
   message_text += l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_APPLICATION_TO_LAUNCH,
-      elided_command) + ASCIIToUTF16("\n\n");
+      elided_command) + base::ASCIIToUTF16("\n\n");
 
   message_text += l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_WARNING);
   return message_text;
 }
 
 base::string16 ExternalProtocolDialogDelegate::GetCheckboxText() const {
   return l10n_util::GetStringUTF16(IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT);
 }
 
 base::string16 ExternalProtocolDialogDelegate::GetTitleText() const {
@@ skipping 13 matching lines @@
 }
 
 void ExternalProtocolDialogDelegate::DoCancel(
     const GURL& url,
     bool dont_block) const {
   if (dont_block) {
       ExternalProtocolHandler::SetBlockState(
           url.scheme(), ExternalProtocolHandler::BLOCK);
   }
 }