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

chrome/browser/ui/content_settings/content_setting_bubble_model.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 "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 232 matching lines @@
 // content type and setting the default value based on the content setting.
 void ContentSettingSingleRadioGroup::SetRadioGroup() {
   GURL url = web_contents()->GetURL();
   base::string16 display_host;
   net::AppendFormattedHost(
       url,
       profile()->GetPrefs()->GetString(prefs::kAcceptLanguages),
       &display_host);
 
   if (display_host.empty())
-    display_host = ASCIIToUTF16(url.spec());
+    display_host = base::ASCIIToUTF16(url.spec());
 
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   bool allowed =
       !content_settings->IsContentBlocked(content_type());
   DCHECK(!allowed ||
          content_settings->IsContentAllowed(content_type()));
 
   RadioGroup radio_group;
   radio_group.url = url;
@@ skipping 386 matching lines @@
       TabSpecificContentSettings::FromWebContents(web_contents());
   GURL url = content_settings->media_stream_access_origin();
   RadioGroup radio_group;
   radio_group.url = url;
 
   base::string16 display_host_utf16;
   net::AppendFormattedHost(
       url,
       profile()->GetPrefs()->GetString(prefs::kAcceptLanguages),
       &display_host_utf16);
-  std::string display_host(UTF16ToUTF8(display_host_utf16));
+  std::string display_host(base::UTF16ToUTF8(display_host_utf16));
   if (display_host.empty())
     display_host = url.spec();
 
   int radio_allow_label_id = 0;
   int radio_block_label_id = 0;
   switch (state_) {
     case TabSpecificContentSettings::MICROPHONE_CAMERA_NOT_ACCESSED:
       NOTREACHED();
       return;
     case TabSpecificContentSettings::MICROPHONE_ACCESSED:
@@ skipping 40 matching lines @@
       } else {
         radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ASK;
       }
 
       radio_block_label_id = IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION;
       selected_item_ = 1;
       break;
   }
 
   std::string radio_allow_label = l10n_util::GetStringFUTF8(
-      radio_allow_label_id, UTF8ToUTF16(display_host));
+      radio_allow_label_id, base::UTF8ToUTF16(display_host));
   std::string radio_block_label =
       l10n_util::GetStringUTF8(radio_block_label_id);
 
   radio_group.default_item = selected_item_;
   radio_group.radio_items.push_back(radio_allow_label);
   radio_group.radio_items.push_back(radio_block_label);
 
   set_radio_group(radio_group);
   set_radio_group_enabled(true);
 }
@@ skipping 281 matching lines @@
   previous_handler_ = content_settings->previous_protocol_handler();
 
   base::string16 protocol;
   if (pending_handler_.protocol() == "mailto") {
     protocol = l10n_util::GetStringUTF16(
         IDS_REGISTER_PROTOCOL_HANDLER_MAILTO_NAME);
   } else if (pending_handler_.protocol() == "webcal") {
     protocol = l10n_util::GetStringUTF16(
         IDS_REGISTER_PROTOCOL_HANDLER_WEBCAL_NAME);
   } else {
-    protocol = UTF8ToUTF16(pending_handler_.protocol());
+    protocol = base::UTF8ToUTF16(pending_handler_.protocol());
   }
 
   if (previous_handler_.IsEmpty()) {
     set_title(l10n_util::GetStringFUTF8(
         IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM,
-        pending_handler_.title(), UTF8ToUTF16(pending_handler_.url().host()),
+        pending_handler_.title(),
+        base::UTF8ToUTF16(pending_handler_.url().host()),
         protocol));
   } else {
     set_title(l10n_util::GetStringFUTF8(
         IDS_REGISTER_PROTOCOL_HANDLER_CONFIRM_REPLACE,
-        pending_handler_.title(), UTF8ToUTF16(pending_handler_.url().host()),
+        pending_handler_.title(),
+        base::UTF8ToUTF16(pending_handler_.url().host()),
         protocol, previous_handler_.title()));
   }
 
   std::string radio_allow_label =
       l10n_util::GetStringFUTF8(IDS_REGISTER_PROTOCOL_HANDLER_ACCEPT,
                                 pending_handler_.title());
   std::string radio_deny_label =
       l10n_util::GetStringUTF8(IDS_REGISTER_PROTOCOL_HANDLER_DENY);
   std::string radio_ignore_label =
       l10n_util::GetStringUTF8(IDS_REGISTER_PROTOCOL_HANDLER_IGNORE);
@@ skipping 252 matching lines @@
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     DCHECK_EQ(web_contents_,
               content::Source<WebContents>(source).ptr());
     web_contents_ = NULL;
   } else {
     DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
     DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
     profile_ = NULL;
   }
 }