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

BUG=330556
TEST=no change
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/107603004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242468 0039d316-1c4b-4281-b951-d872f2087c98

111 files changed, 266 insertions, 224 deletions

diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index c7f2ac3..d0fed54 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -468,7 +468,8 @@ ExtensionInstallDialogView::ExtensionInstallDialogView(
     BundleInstaller::ItemList items = prompt.bundle()->GetItemsWithState(
         BundleInstaller::Item::STATE_PENDING);
     for (size_t i = 0; i < items.size(); ++i) {
-      base::string16 extension_name = UTF8ToUTF16(items[i].localized_name);
+      base::string16 extension_name =
+          base::UTF8ToUTF16(items[i].localized_name);
       base::i18n::AdjustStringForLocaleDirection(&extension_name);
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
       layout->StartRow(0, column_set_id);
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
index 711a03a..1367164 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
@@ -145,7 +145,7 @@ class InstalledBubbleContent : public views::View,
       }
       case ExtensionInstalledBubble::OMNIBOX_KEYWORD: {
         flavors_ |= HOW_TO_USE | HOW_TO_MANAGE;
-        key = UTF8ToUTF16(extensions::OmniboxInfo::GetKeyword(extension));
+        key = base::UTF8ToUTF16(extensions::OmniboxInfo::GetKeyword(extension));
         break;
       }
       case ExtensionInstalledBubble::GENERIC: {
@@ -174,7 +174,7 @@ class InstalledBubbleContent : public views::View,
     AddChildView(icon_);
 
     // Add the heading (for all flavors).
-    base::string16 extension_name = UTF8ToUTF16(extension->name());
+    base::string16 extension_name = base::UTF8ToUTF16(extension->name());
     base::i18n::AdjustStringForLocaleDirection(&extension_name);
     heading_ = new views::Label(l10n_util::GetStringFUTF16(
         IDS_EXTENSION_INSTALLED_HEADING, extension_name));
diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
index 8f08fc6..f8260b5 100644
--- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
@@ -248,16 +248,16 @@ void ExtensionMessageBubbleView::Init() {
     for (; i < suspicious.size() && i < kMaxExtensionsToShow; ++i) {
       // Add each extension with bullet point.
       extension_list.push_back(
-          bullet_point + ASCIIToUTF16(" ") + suspicious[i]);
+          bullet_point + base::ASCIIToUTF16(" ") + suspicious[i]);
     }
 
     if (i > kMaxExtensionsToShow) {
       base::string16 difference = base::IntToString16(i - kMaxExtensionsToShow);
-      extension_list.push_back(bullet_point + ASCIIToUTF16(" ") +
+      extension_list.push_back(bullet_point + base::ASCIIToUTF16(" ") +
           delegate_->GetOverflowText(difference));
     }
 
-    extensions->SetText(JoinString(extension_list, ASCIIToUTF16("\n")));
+    extensions->SetText(JoinString(extension_list, base::ASCIIToUTF16("\n")));
     extensions->SizeToFit(views::Widget::GetLocalizedContentsWidth(
         IDS_EXTENSION_WIPEOUT_BUBBLE_WIDTH_CHARS));
     layout->AddView(extensions);
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
index 6faccf4..0096521 100644
--- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -167,7 +167,7 @@ ExtensionUninstallDialogDelegateView::ExtensionUninstallDialogDelegateView(
 
   heading_ = new views::Label(
       l10n_util::GetStringFUTF16(IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,
-                                 UTF8ToUTF16(extension->name())));
+                                 base::UTF8ToUTF16(extension->name())));
   heading_->SetMultiLine(true);
   AddChildView(heading_);
 }
diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc
index 690ee2b..1a9eeab 100644
--- a/chrome/browser/ui/views/external_protocol_dialog.cc
+++ b/chrome/browser/ui/views/external_protocol_dialog.cc
@@ -134,18 +134,18 @@ ExternalProtocolDialog::ExternalProtocolDialog(const GURL& url,
   const int kMaxCommandSize = 256;
   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(WideToUTF16Hack(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);
 
@@ -171,9 +171,9 @@ std::wstring ExternalProtocolDialog::GetApplicationForProtocol(
   // to disk.  http://crbug.com/61996
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
-  std::wstring url_spec = ASCIIToWide(url.possibly_invalid_spec());
+  std::wstring url_spec = base::ASCIIToWide(url.possibly_invalid_spec());
   std::wstring cmd_key_path =
-      ASCIIToWide(url.scheme() + "\\shell\\open\\command");
+      base::ASCIIToWide(url.scheme() + "\\shell\\open\\command");
   base::win::RegKey cmd_key(HKEY_CLASSES_ROOT, cmd_key_path.c_str(), KEY_READ);
   size_t split_offset = url_spec.find(L':');
   if (split_offset == std::wstring::npos)
diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
index de4fc0e..852a350 100644
--- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
@@ -26,6 +26,7 @@
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 
+using base::ASCIIToUTF16;
 using content::WebContents;
 
 namespace {
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc
index 7420c03..41c7ba9 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_win.cc
@@ -510,7 +510,7 @@ void BrowserFrameWin::GetMetroCurrentTabInfo(WPARAM w_param) {
   DCHECK(current_tab);
 
   current_tab_info->url = base::win::LocalAllocAndCopyString(
-      UTF8ToWide(current_tab->GetURL().spec()));
+      base::UTF8ToWide(current_tab->GetURL().spec()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
index 0189a70..3d976ce 100644
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
@@ -138,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
 
   // The default profile's name should be part of the relaunch name.
   ValidateBrowserWindowProperties(
-      browser(), UTF8ToUTF16(browser()->profile()->GetProfileName()));
+      browser(), base::UTF8ToUTF16(browser()->profile()->GetProfileName()));
 
   // The second profile's name should be part of the relaunch name.
   Browser* profile2_browser =
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc
index 87cee29..ea45360 100644
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc
@@ -43,8 +43,9 @@ void BrowserWindowPropertyManager::UpdateWindowProperties(HWND hwnd) {
   // Set the app user model id for this application to that of the application
   // name. See http://crbug.com/7028.
   base::string16 app_id = browser->is_app() ?
-      ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(browser->app_name()),
-                                                profile->GetPath()) :
+      ShellIntegration::GetAppModelIdForProfile(
+          base::UTF8ToWide(browser->app_name()),
+          profile->GetPath()) :
       ShellIntegration::GetChromiumModelIdForProfile(profile->GetPath());
   base::string16 icon_path_string;
   base::string16 command_line_string;
diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
index 5b91665..c32b383 100644
--- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
@@ -529,10 +529,10 @@ void GlobalMenuBarX11::AddHistoryItemToMenu(HistoryItem* item,
   std::string url_string = item->url.possibly_invalid_spec();
 
   if (title.empty())
-    title = UTF8ToUTF16(url_string);
+    title = base::UTF8ToUTF16(url_string);
   gfx::ElideString(title, kMaximumMenuWidthInChars, &title);
 
-  DbusmenuMenuitem* menu_item = BuildMenuItem(UTF16ToUTF8(title), tag);
+  DbusmenuMenuitem* menu_item = BuildMenuItem(base::UTF16ToUTF8(title), tag);
   g_signal_connect(menu_item, "item-activated",
                    G_CALLBACK(OnHistoryItemActivatedThunk), this);
 
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
index 4fe14c7..8a6f09b 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc
@@ -407,7 +407,7 @@ TEST_F(OpaqueBrowserFrameViewLayoutTest, MaximizedWithoutCaptionButtons) {
 
 TEST_F(OpaqueBrowserFrameViewLayoutTest, WithWindowTitleAndIcon) {
   // Tests the layout of pop up windows.
-  delegate_->SetWindowTitle(ASCIIToUTF16("Window Title"));
+  delegate_->SetWindowTitle(base::ASCIIToUTF16("Window Title"));
   AddWindowTitleIcons();
   root_view_->Layout();
 
diff --git a/chrome/browser/ui/views/frame/system_menu_model_builder.cc b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
index 71c9482..1382e98 100644
--- a/chrome/browser/ui/views/frame/system_menu_model_builder.cc
+++ b/chrome/browser/ui/views/frame/system_menu_model_builder.cc
@@ -109,7 +109,8 @@ void SystemMenuModelBuilder::AddFrameToggleItems(ui::SimpleMenuModel* model) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDebugEnableFrameToggle)) {
     model->AddSeparator(ui::NORMAL_SEPARATOR);
-    model->AddItem(IDC_DEBUG_FRAME_TOGGLE, ASCIIToUTF16("Toggle Frame Type"));
+    model->AddItem(IDC_DEBUG_FRAME_TOGGLE,
+                   base::ASCIIToUTF16("Toggle Frame Type"));
   }
 }
 
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
index ec7c5c2..b653cfb 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
@@ -241,7 +241,7 @@ void FullscreenExitBubbleViews::FullscreenExitView::UpdateContent(
     if (link_visible) {
       link_->SetText(
           l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_MODE) +
-          UTF8ToUTF16(" ") +
+          base::UTF8ToUTF16(" ") +
           l10n_util::GetStringFUTF16(IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR,
               accelerator));
     }
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index b651984..3a9a4d5 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -102,7 +102,7 @@ void ContentSettingImageView::Update(content::WebContents* web_contents) {
   icon_->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       content_setting_image_model_->get_icon()));
   icon_->SetTooltipText(
-      UTF8ToUTF16(content_setting_image_model_->get_tooltip()));
+      base::UTF8ToUTF16(content_setting_image_model_->get_tooltip()));
   SetVisible(true);
 
   // If the content blockage should be indicated to the user, start the
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index 49c773c..96fb5e8 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -143,7 +143,7 @@ void PageActionImageView::ExecuteAction(
 
 void PageActionImageView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
-  state->name = UTF8ToUTF16(tooltip_);
+  state->name = base::UTF8ToUTF16(tooltip_);
 }
 
 bool PageActionImageView::OnMousePressed(const ui::MouseEvent& event) {
@@ -226,7 +226,7 @@ void PageActionImageView::UpdateVisibility(WebContents* contents,
 
   // Set the tooltip.
   tooltip_ = page_action_->GetTitle(current_tab_id_);
-  SetTooltipText(UTF8ToUTF16(tooltip_));
+  SetTooltipText(base::UTF8ToUTF16(tooltip_));
 
   // Set the image.
   gfx::Image icon = icon_factory_->GetIcon(current_tab_id_);
diff --git a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
index d85c5a3..7337b29 100644
--- a/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
+++ b/chrome/browser/ui/views/location_bar/star_view_browsertest.cc
@@ -101,7 +101,7 @@ IN_PROC_BROWSER_TEST_F(StarViewTestNoDWM, WindowedNPAPIPluginHidden) {
   browser()->tab_strip_model()->ActivateTabAt(0, true);
 
   // First load the page and wait for the NPAPI plugin's window to display.
-  base::string16 expected_title(ASCIIToUTF16("ready"));
+  base::string16 expected_title(base::ASCIIToUTF16("ready"));
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   content::TitleWatcher title_watcher(tab, expected_title);
diff --git a/chrome/browser/ui/views/menu_item_view_test.cc b/chrome/browser/ui/views/menu_item_view_test.cc
index 57b0ff4..8990f0d 100644
--- a/chrome/browser/ui/views/menu_item_view_test.cc
+++ b/chrome/browser/ui/views/menu_item_view_test.cc
@@ -17,6 +17,8 @@
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
+using base::ASCIIToUTF16;
+
 // This is a convenience base class for all tests to provide some
 // common functionality.  It sets up a MenuButton and a MenuItemView
 // and clicks the MenuButton.
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc
index 8c1eab8..67ce9b7 100644
--- a/chrome/browser/ui/views/menu_model_adapter_test.cc
+++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -129,7 +129,7 @@ class SubMenuModel : public CommonMenuModel {
   }
 
   virtual base::string16 GetLabelAt(int index) const OVERRIDE {
-    return ASCIIToUTF16("Item");
+    return base::ASCIIToUTF16("Item");
   }
 
   virtual void MenuWillShow() OVERRIDE {
@@ -173,7 +173,7 @@ class TopMenuModel : public CommonMenuModel {
   }
 
   virtual base::string16 GetLabelAt(int index) const OVERRIDE {
-    return ASCIIToUTF16("submenu");
+    return base::ASCIIToUTF16("submenu");
   }
 
   virtual MenuModel* GetSubmenuModelAt(int index) const OVERRIDE {
@@ -207,7 +207,7 @@ class MenuModelAdapterTest : public ViewEventTestBase,
 
   virtual void SetUp() OVERRIDE {
     button_ = new views::MenuButton(
-        NULL, ASCIIToUTF16("Menu Adapter Test"), this, true);
+        NULL, base::ASCIIToUTF16("Menu Adapter Test"), this, true);
 
     menu_ = menu_model_adapter_.CreateMenu();
     menu_runner_.reset(new views::MenuRunner(menu_));
diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc
index d7c740c..85e64c1 100644
--- a/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc
+++ b/chrome/browser/ui/views/message_center/web_notification_tray_browsertest.cc
@@ -64,11 +64,12 @@ class WebNotificationTrayTest : public InProcessBrowserTest {
   void AddNotification(const std::string& id, const std::string& replace_id) {
     ::Notification notification(GURL("chrome-extension://abbccedd"),
                                 GURL(),
-                                ASCIIToUTF16("Test Web Notification"),
-                                ASCIIToUTF16("Notification message body."),
+                                base::ASCIIToUTF16("Test Web Notification"),
+                                base::ASCIIToUTF16(
+                                    "Notification message body."),
                                 blink::WebTextDirectionDefault,
                                 base::string16(),
-                                ASCIIToUTF16(replace_id),
+                                base::ASCIIToUTF16(replace_id),
                                 new TestNotificationDelegate(id));
 
     g_browser_process->notification_ui_manager()->Add(
@@ -79,11 +80,11 @@ class WebNotificationTrayTest : public InProcessBrowserTest {
                           const std::string& new_id) {
     ::Notification notification(GURL("chrome-extension://abbccedd"),
                                 GURL(""),
-                                ASCIIToUTF16("Updated Web Notification"),
-                                ASCIIToUTF16("Updated message body."),
+                                base::ASCIIToUTF16("Updated Web Notification"),
+                                base::ASCIIToUTF16("Updated message body."),
                                 blink::WebTextDirectionDefault,
                                 base::string16(),
-                                ASCIIToUTF16(replace_id),
+                                base::ASCIIToUTF16(replace_id),
                                 new TestNotificationDelegate(new_id));
 
     g_browser_process->notification_ui_manager()->Add(
diff --git a/chrome/browser/ui/views/new_avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/new_avatar_menu_button_browsertest.cc
index f675d9b..7011151 100644
--- a/chrome/browser/ui/views/new_avatar_menu_button_browsertest.cc
+++ b/chrome/browser/ui/views/new_avatar_menu_button_browsertest.cc
@@ -60,7 +60,7 @@ void NewAvatarMenuButtonTest::CreateTestingProfile() {
 
   // Sign in the default profile
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
-  cache.SetUserNameOfProfileAtIndex(0, UTF8ToUTF16("user_name"));
+  cache.SetUserNameOfProfileAtIndex(0, base::UTF8ToUTF16("user_name"));
 
   base::FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index cb3ca82..e66adf5 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -500,7 +500,7 @@ void OmniboxViewViews::SetForcedQuery() {
   const base::string16 current_text(text());
   const size_t start = current_text.find_first_not_of(base::kWhitespaceUTF16);
   if (start == base::string16::npos || (current_text[start] != '?'))
-    OmniboxView::SetUserText(ASCIIToUTF16("?"));
+    OmniboxView::SetUserText(base::ASCIIToUTF16("?"));
   else
     SelectRange(gfx::Range(current_text.size(), start + 1));
 }
@@ -802,7 +802,8 @@ int OmniboxViewViews::OnDrop(const ui::OSExchangeData& data) {
     GURL url;
     base::string16 title;
     if (data.GetURLAndTitle(&url, &title)) {
-      base::string16 text(StripJavascriptSchemas(UTF8ToUTF16(url.spec())));
+      base::string16 text(
+          StripJavascriptSchemas(base::UTF8ToUTF16(url.spec())));
       if (model()->CanPasteAndGo(text)) {
         model()->PasteAndGo(text);
         return ui::DragDropTypes::DRAG_COPY;
@@ -924,7 +925,7 @@ void OmniboxViewViews::EmphasizeURLComponents() {
   url_parse::Component scheme, host;
   AutocompleteInput::ParseForEmphasizeComponents(text(), &scheme, &host);
   bool grey_out_url = text().substr(scheme.begin, scheme.len) ==
-      UTF8ToUTF16(extensions::kExtensionScheme);
+      base::UTF8ToUTF16(extensions::kExtensionScheme);
   bool grey_base = model()->CurrentTextIsURL() &&
       (host.is_nonempty() || grey_out_url);
   SetColor(location_bar_view_->GetColor(
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
index f30672e..e52aa11 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
@@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, PasteAndGoDoesNotLeavePopupOpen) {
   {
     ui::ScopedClipboardWriter clipboard_writer(
         ui::Clipboard::GetForCurrentThread(), ui::CLIPBOARD_TYPE_COPY_PASTE);
-    clipboard_writer.WriteURL(ASCIIToUTF16("http://www.example.com/"));
+    clipboard_writer.WriteURL(base::ASCIIToUTF16("http://www.example.com/"));
   }
 
   // Paste and go.
@@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, PasteAndGoDoesNotLeavePopupOpen) {
 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, SelectAllOnClick) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &omnibox_view));
-  omnibox_view->SetUserText(ASCIIToUTF16("http://www.google.com/"));
+  omnibox_view->SetUserText(base::ASCIIToUTF16("http://www.google.com/"));
 
   // Take the focus away from the omnibox.
   ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter());
@@ -186,7 +186,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, SelectAllOnClick) {
 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, SelectAllOnTap) {
   OmniboxView* omnibox_view = NULL;
   ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &omnibox_view));
-  omnibox_view->SetUserText(ASCIIToUTF16("http://www.google.com/"));
+  omnibox_view->SetUserText(base::ASCIIToUTF16("http://www.google.com/"));
 
   // Take the focus away from the omnibox.
   ASSERT_NO_FATAL_FAILURE(TapBrowserWindowCenter());
diff --git a/chrome/browser/ui/views/panels/panel_stack_view.cc b/chrome/browser/ui/views/panels/panel_stack_view.cc
index edbc549..057bac2 100644
--- a/chrome/browser/ui/views/panels/panel_stack_view.cc
+++ b/chrome/browser/ui/views/panels/panel_stack_view.cc
@@ -504,8 +504,8 @@ views::Widget* PanelStackView::CreateWindowWithBounds(const gfx::Rect& bounds) {
   DCHECK(!panels_.empty());
   Panel* panel = panels_.front();
   ui::win::SetAppIdForWindow(
-      ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(panel->app_name()),
-                                                panel->profile()->GetPath()),
+      ShellIntegration::GetAppModelIdForProfile(
+          base::UTF8ToWide(panel->app_name()), panel->profile()->GetPath()),
       views::HWNDForWidget(window));
 
   // Remove the filter for old window in case that we're recreating the window.
diff --git a/chrome/browser/ui/views/panels/panel_view.cc b/chrome/browser/ui/views/panels/panel_view.cc
index 09cbd96c..a65ff07 100644
--- a/chrome/browser/ui/views/panels/panel_view.cc
+++ b/chrome/browser/ui/views/panels/panel_view.cc
@@ -300,8 +300,8 @@ PanelView::PanelView(Panel* panel, const gfx::Rect& bounds, bool always_on_top)
 
 #if defined(OS_WIN)
   ui::win::SetAppIdForWindow(
-      ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(panel->app_name()),
-                                                panel->profile()->GetPath()),
+      ShellIntegration::GetAppModelIdForProfile(
+          base::UTF8ToWide(panel->app_name()), panel->profile()->GetPath()),
       views::HWNDForWidget(window_));
   ui::win::PreventWindowFromPinning(views::HWNDForWidget(window_));
 #endif
diff --git a/chrome/browser/ui/views/password_generation_bubble_view.cc b/chrome/browser/ui/views/password_generation_bubble_view.cc
index 44183c59..c3114f3 100644
--- a/chrome/browser/ui/views/password_generation_bubble_view.cc
+++ b/chrome/browser/ui/views/password_generation_bubble_view.cc
@@ -168,7 +168,7 @@ void PasswordGenerationBubbleView::Init() {
 
   textfield_ = new views::Textfield();
   textfield_->set_default_width_in_chars(kDefaultTextFieldChars);
-  textfield_->SetText(ASCIIToUTF16(password_generator_->Generate()));
+  textfield_->SetText(base::ASCIIToUTF16(password_generator_->Generate()));
   textfield_->SetController(this);
 
   textfield_wrapper_ = new TextfieldWrapper(textfield_,
@@ -226,7 +226,7 @@ void PasswordGenerationBubbleView::ButtonPressed(views::Button* sender,
   }
   if (sender == regenerate_button_) {
     textfield_->SetText(
-        ASCIIToUTF16(password_generator_->Generate()));
+        base::ASCIIToUTF16(password_generator_->Generate()));
     actions_.password_regenerated = true;
   }
 }
diff --git a/chrome/browser/ui/views/profile_chooser_view.cc b/chrome/browser/ui/views/profile_chooser_view.cc
index f6a8822..aa99a52 100644
--- a/chrome/browser/ui/views/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profile_chooser_view.cc
@@ -827,7 +827,7 @@ void ProfileChooserView::CreateAccountButton(views::GridLayout* layout,
   // unnamed "multiple accounts" buttons.
   views::MenuButton* email_button = new views::MenuButton(
       NULL,
-      gfx::ElideEmail(UTF8ToUTF16(account),
+      gfx::ElideEmail(base::UTF8ToUTF16(account),
                       rb->GetFontList(ui::ResourceBundle::BaseFont),
                       width()),
       is_primary_account ? NULL : this,  // Cannot delete the primary account.
diff --git a/chrome/browser/ui/views/script_bubble_view.cc b/chrome/browser/ui/views/script_bubble_view.cc
index cb472cb..4cc0472 100644
--- a/chrome/browser/ui/views/script_bubble_view.cc
+++ b/chrome/browser/ui/views/script_bubble_view.cc
@@ -78,7 +78,7 @@ ScriptBubbleView::ScriptBubbleView(views::View* anchor_view,
         extension_service->GetExtensionById(*iter, true);
     ScriptEntry entry;
     entry.extension_id = *iter;
-    entry.extension_name = UTF8ToUTF16(extension->name());
+    entry.extension_name = base::UTF8ToUTF16(extension->name());
     entries_.push_back(entry);
 
     int size = extension_misc::EXTENSION_ICON_BITTY;
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
index 30dc10b..76074ba 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
@@ -9,7 +9,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/strings/utf_string_conversions.h"  // ASCIIToUTF16
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/component_loader.h"
@@ -203,7 +203,7 @@ class SelectFileDialogExtensionBrowserTest : public ExtensionBrowserTest {
     std::string button_class =
         (button_type == DIALOG_BTN_OK) ? ".button-panel .ok" :
                                          ".button-panel .cancel";
-    base::string16 script = ASCIIToUTF16(
+    base::string16 script = base::ASCIIToUTF16(
         "console.log(\'Test JavaScript injected.\');"
         "document.querySelector(\'" + button_class + "\').click();");
     // The file selection handler closes the dialog and does not return control
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
index a97a0ac..6187a55 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
@@ -73,8 +73,8 @@ CertificateSelectorTableModel::CertificateSelectorTableModel(
     net::X509Certificate* cert = cert_request_info->client_certs[i].get();
     base::string16 text = l10n_util::GetStringFUTF16(
         IDS_CERT_SELECTOR_TABLE_CERT_FORMAT,
-        UTF8ToUTF16(cert->subject().GetDisplayName()),
-        UTF8ToUTF16(cert->issuer().GetDisplayName()));
+        base::UTF8ToUTF16(cert->subject().GetDisplayName()),
+        base::UTF8ToUTF16(cert->issuer().GetDisplayName()));
     items_.push_back(text);
   }
 }
@@ -130,7 +130,7 @@ void SSLClientCertificateSelector::Init() {
   layout->StartRow(0, column_set_id);
   base::string16 text = l10n_util::GetStringFUTF16(
       IDS_CLIENT_CERT_DIALOG_TEXT,
-      ASCIIToUTF16(cert_request_info()->host_and_port.ToString()));
+      base::ASCIIToUTF16(cert_request_info()->host_and_port.ToString()));
   views::Label* label = new views::Label(text);
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
index cbff6d1..5502430 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
@@ -47,7 +47,7 @@ TEST(StatusTrayWinTest, CreateIconAndMenu) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
   StatusIcon* icon = tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, ASCIIToUTF16("tool tip"));
+      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip"));
   icon->SetPressedImage(*image);
   scoped_ptr<StatusIconMenuModel> menu(new StatusIconMenuModel(NULL));
   menu->AddItem(0, L"foo");
@@ -62,7 +62,7 @@ TEST(StatusTrayWinTest, ClickOnIcon) {
   gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
 
   StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, ASCIIToUTF16("tool tip")));
+      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
   FakeStatusIconObserver observer;
   icon->AddObserver(&observer);
   // Mimic a click.
@@ -80,7 +80,7 @@ TEST(StatusTrayWinTest, ClickOnBalloon) {
   gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
 
   StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, ASCIIToUTF16("tool tip")));
+      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
   FakeStatusIconObserver observer;
   icon->AddObserver(&observer);
   // Mimic a click.
@@ -96,7 +96,7 @@ TEST(StatusTrayWinTest, HandleOldIconId) {
   gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
 
   StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, ASCIIToUTF16("tool tip")));
+      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
   UINT message_id = icon->message_id();
   UINT icon_id = icon->icon_id();
 
diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
index 9c707e0..b494594 100644
--- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
+++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
@@ -161,8 +161,8 @@ void ProfileSigninConfirmationDialogViews::ViewHierarchyChanged(
   // Create the prompt label.
   size_t offset;
   const base::string16 domain =
-      ASCIIToUTF16(gaia::ExtractDomainName(username_));
-  const base::string16 username = ASCIIToUTF16(username_);
+      base::ASCIIToUTF16(gaia::ExtractDomainName(username_));
+  const base::string16 username = base::ASCIIToUTF16(username_);
   const base::string16 prompt_text =
       l10n_util::GetStringFUTF16(
           IDS_ENTERPRISE_SIGNIN_ALERT_NEW_STYLE,
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index f8653ee..607559d 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -402,7 +402,7 @@ void TaskManagerView::UpdateStatsCounters() {
         // stat names not in the string table would be filtered out.
         ui::TableColumn col;
         col.id = i;
-        col.title = ASCIIToUTF16(row);
+        col.title = base::ASCIIToUTF16(row);
         col.alignment = ui::TableColumn::RIGHT;
         // TODO(erikkay): Width is hard-coded right now, so many column
         // names are clipped.
diff --git a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
index 2b38199..bcfe55c 100644
--- a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
+++ b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc
@@ -66,7 +66,7 @@ std::string BrowserActionTestUtil::GetTooltip(int index) {
   base::string16 text;
   GetContainer(browser_)->GetBrowserActionViewAt(index)->button()->
     GetTooltipText(gfx::Point(), &text);
-  return UTF16ToUTF8(text);
+  return base::UTF16ToUTF8(text);
 }
 
 bool BrowserActionTestUtil::HasPopup() {
diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.cc b/chrome/browser/ui/views/toolbar/browser_action_view.cc
index 8d15339..bf6a496 100644
--- a/chrome/browser/ui/views/toolbar/browser_action_view.cc
+++ b/chrome/browser/ui/views/toolbar/browser_action_view.cc
@@ -261,7 +261,7 @@ void BrowserActionButton::UpdateState() {
   // If the browser action name is empty, show the extension name instead.
   std::string title = browser_action()->GetTitle(tab_id);
   base::string16 name =
-      UTF8ToUTF16(title.empty() ? extension()->name() : title);
+      base::UTF8ToUTF16(title.empty() ? extension()->name() : title);
   SetTooltipText(delegate_->NeedToShowTooltip() ? name : base::string16());
   SetAccessibleName(name);
 
diff --git a/chrome/browser/ui/views/toolbar/site_chip_view.cc b/chrome/browser/ui/views/toolbar/site_chip_view.cc
index c0e8db2..4e33471 100644
--- a/chrome/browser/ui/views/toolbar/site_chip_view.cc
+++ b/chrome/browser/ui/views/toolbar/site_chip_view.cc
@@ -217,15 +217,15 @@ base::string16 SiteChipView::SiteLabelFromURL(const GURL& provided_url) {
     base::string16 formatted = net::FormatUrl(url.GetOrigin(), languages,
         net::kFormatUrlOmitAll, net::UnescapeRule::NORMAL, NULL, NULL, NULL);
     // Remove scheme, "www.", and trailing "/".
-    if (StartsWith(formatted, ASCIIToUTF16("http://"), false))
+    if (StartsWith(formatted, base::ASCIIToUTF16("http://"), false))
       formatted = formatted.substr(7);
-    else if (StartsWith(formatted, ASCIIToUTF16("https://"), false))
+    else if (StartsWith(formatted, base::ASCIIToUTF16("https://"), false))
       formatted = formatted.substr(8);
-    else if (StartsWith(formatted, ASCIIToUTF16("ftp://"), false))
+    else if (StartsWith(formatted, base::ASCIIToUTF16("ftp://"), false))
       formatted = formatted.substr(6);
-    if (StartsWith(formatted, ASCIIToUTF16("www."), false))
+    if (StartsWith(formatted, base::ASCIIToUTF16("www."), false))
       formatted = formatted.substr(4);
-    if (EndsWith(formatted, ASCIIToUTF16("/"), false))
+    if (EndsWith(formatted, base::ASCIIToUTF16("/"), false))
       formatted = formatted.substr(0, formatted.size()-1);
     return formatted;
   }
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc
index b58fc5f..c04a44d 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc
@@ -109,7 +109,7 @@ IN_PROC_BROWSER_TEST_F(ToolbarViewTest,
   BookmarkModel* model =
       BookmarkModelFactory::GetForProfile(browser()->profile());
   bookmark_utils::AddIfNotBookmarked(
-      model, GURL("http://foo.com"), ASCIIToUTF16("Foo"));
+      model, GURL("http://foo.com"), base::ASCIIToUTF16("Foo"));
 
   // We want to specifically test the case where the bookmark bar is
   // already showing when a window opens, so create a second browser
diff --git a/chrome/browser/ui/views/validation_message_bubble_delegate_unittest.cc b/chrome/browser/ui/views/validation_message_bubble_delegate_unittest.cc
index 381dba5..3b562dd 100644
--- a/chrome/browser/ui/views/validation_message_bubble_delegate_unittest.cc
+++ b/chrome/browser/ui/views/validation_message_bubble_delegate_unittest.cc
@@ -12,7 +12,8 @@ namespace {
 gfx::Size GetSizeForMessages(const std::string& main_text,
                              const std::string& sub_text) {
   ValidationMessageBubbleDelegate delegate(
-      gfx::Rect(), UTF8ToUTF16(main_text), UTF8ToUTF16(sub_text), NULL);
+      gfx::Rect(), base::UTF8ToUTF16(main_text),
+      base::UTF8ToUTF16(sub_text), NULL);
   return delegate.GetPreferredSize();
 }
 
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index b9d93ac..6aba873 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -432,7 +432,7 @@ void WebsiteSettingsPopupView::SetCookieInfo(
        ++i) {
     base::string16 label_text = l10n_util::GetStringFUTF16(
         IDS_WEBSITE_SETTINGS_SITE_DATA_STATS_LINE,
-        UTF8ToUTF16(i->cookie_source),
+        base::UTF8ToUTF16(i->cookie_source),
         base::IntToString16(i->allowed),
         base::IntToString16(i->blocked));
     if (i != cookie_info_list.begin())
@@ -512,7 +512,7 @@ void WebsiteSettingsPopupView::SetIdentityInfo(
          l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_IDENTITY_NOT_VERIFIED);
       break;
   }
-  header_->SetIdentityName(UTF8ToUTF16(identity_info.site_identity));
+  header_->SetIdentityName(base::UTF8ToUTF16(identity_info.site_identity));
   header_->SetIdentityStatus(identity_status_text, text_color);
 
   // The headline and the certificate dialog link of the site's identity
@@ -533,20 +533,20 @@ void WebsiteSettingsPopupView::SetIdentityInfo(
 
     // XXX(eranm): Wire the SCT Viewer here.
 
-    headline = UTF8ToUTF16(identity_info.site_identity);
+    headline = base::UTF8ToUTF16(identity_info.site_identity);
   }
   ResetConnectionSection(
       identity_info_content_,
       WebsiteSettingsUI::GetIdentityIcon(identity_info.identity_status),
       base::string16(),  // The identity section has no headline.
-      UTF8ToUTF16(identity_info.identity_status_description),
+      base::UTF8ToUTF16(identity_info.identity_status_description),
       certificate_dialog_link_);
 
   ResetConnectionSection(
       connection_info_content_,
       WebsiteSettingsUI::GetConnectionIcon(identity_info.connection_status),
       base::string16(),  // The connection section has no headline.
-      UTF8ToUTF16(identity_info.connection_status_description),
+      base::UTF8ToUTF16(identity_info.connection_status_description),
       NULL);
 
   connection_tab_->InvalidateLayout();
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc
index 8cced49..490d97c 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.cc
+++ b/chrome/browser/ui/web_applications/web_app_ui.cc
@@ -300,7 +300,8 @@ void UpdateShortcutWorker::UpdateShortcutsOnFileThread() {
   if (!shortcut_files_.empty()) {
     // Generates app id from web app url and profile path.
     base::string16 app_id = ShellIntegration::GetAppModelIdForProfile(
-        UTF8ToWide(web_app::GenerateApplicationNameFromURL(shortcut_info_.url)),
+        base::UTF8ToWide(
+            web_app::GenerateApplicationNameFromURL(shortcut_info_.url)),
         profile_path_);
 
     // Sanitize description
@@ -404,7 +405,7 @@ void GetShortcutInfoForTab(WebContents* web_contents,
   info->url = app_info.app_url.is_empty() ? web_contents->GetURL() :
                                             app_info.app_url;
   info->title = app_info.title.empty() ?
-      (web_contents->GetTitle().empty() ? UTF8ToUTF16(info->url.spec()) :
+      (web_contents->GetTitle().empty() ? base::UTF8ToUTF16(info->url.spec()) :
                                           web_contents->GetTitle()) :
       app_info.title;
   info->description = app_info.description;
@@ -429,8 +430,8 @@ void UpdateShortcutInfoForApp(const extensions::Extension& app,
   shortcut_info->extension_id = app.id();
   shortcut_info->is_platform_app = app.is_platform_app();
   shortcut_info->url = extensions::AppLaunchInfo::GetLaunchWebURL(&app);
-  shortcut_info->title = UTF8ToUTF16(app.name());
-  shortcut_info->description = UTF8ToUTF16(app.description());
+  shortcut_info->title = base::UTF8ToUTF16(app.name());
+  shortcut_info->description = base::UTF8ToUTF16(app.description());
   shortcut_info->extension_path = app.path();
   shortcut_info->profile_path = profile->GetPath();
   shortcut_info->profile_name =
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index b3c6571..fbe717f 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -51,6 +51,8 @@
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #endif
 
+using base::ASCIIToUTF16;
+using base::UTF8ToUTF16;
 using content::BrowserThread;
 
 namespace {
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index cb03b31..fd1c622 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -316,7 +316,8 @@ TEST_F(WebsiteSettingsTest, HTTPSEVCert) {
             website_settings()->site_connection_status());
   EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT,
             website_settings()->site_identity_status());
-  EXPECT_EQ(UTF8ToUTF16("Google Inc"), website_settings()->organization_name());
+  EXPECT_EQ(base::UTF8ToUTF16("Google Inc"),
+            website_settings()->organization_name());
 }
 
 TEST_F(WebsiteSettingsTest, HTTPSRevocationError) {
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 759f4b8..360d941 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -465,7 +465,7 @@ std::string AboutDiscards(const std::string& path) {
     output.append("<ul>");
     std::vector<base::string16>::iterator it = titles.begin();
     for ( ; it != titles.end(); ++it) {
-      std::string title = UTF16ToUTF8(*it);
+      std::string title = base::UTF16ToUTF8(*it);
       title = net::EscapeForHTML(title);
       output.append(WrapWithTag("li", title));
     }
@@ -779,7 +779,7 @@ std::string AboutLinuxProxyConfig() {
   data.append(l10n_util::GetStringFUTF8(
       IDS_ABOUT_LINUX_PROXY_CONFIG_BODY,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-      ASCIIToUTF16(binary.BaseName().value())));
+      base::ASCIIToUTF16(binary.BaseName().value())));
   AppendFooter(&data);
   return data;
 }
@@ -937,12 +937,12 @@ void AboutMemoryHandler::OnDetailsAvailable() {
 
     // We log memory info as we record it.
     if (!log_string.empty())
-      log_string += ASCIIToUTF16(", ");
-    log_string += browser_processes[index].name + ASCIIToUTF16(", ") +
+      log_string += base::ASCIIToUTF16(", ");
+    log_string += browser_processes[index].name + base::ASCIIToUTF16(", ") +
                   base::Int64ToString16(aggregate.working_set.priv) +
-                  ASCIIToUTF16(", ") +
+                  base::ASCIIToUTF16(", ") +
                   base::Int64ToString16(aggregate.working_set.shared) +
-                  ASCIIToUTF16(", ") +
+                  base::ASCIIToUTF16(", ") +
                   base::Int64ToString16(aggregate.working_set.shareable);
   }
   if (!log_string.empty())
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
index f9f3aaa..07888f6 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
@@ -163,7 +163,7 @@ static void SetupHistoryPageTest(Browser* browser,
   const GURL history_url = GURL(page_url);
   history_service->AddPage(
       history_url, base::Time::Now(), history::SOURCE_BROWSED);
-  history_service->SetPageTitle(history_url, UTF8ToUTF16(page_title));
+  history_service->SetPageTitle(history_url, base::UTF8ToUTF16(page_title));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR,
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc
index f2812d9..4991ce1 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.cc
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc
@@ -44,7 +44,7 @@ CertificateViewerDialog::CertificateViewerDialog(net::X509Certificate* cert)
   x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(),
       &cert_chain);
   title_ = l10n_util::GetStringFUTF16(IDS_CERT_INFO_DIALOG_TITLE,
-      UTF8ToUTF16(x509_certificate_model::GetTitle(cert_chain.front())));
+      base::UTF8ToUTF16(x509_certificate_model::GetTitle(cert_chain.front())));
 }
 
 CertificateViewerDialog::~CertificateViewerDialog() {
@@ -114,7 +114,8 @@ std::string CertificateViewerDialog::GetDialogArgs() const {
   const std::string alternative_text =
       l10n_util::GetStringUTF8(IDS_CERT_INFO_FIELD_NOT_PRESENT);
   cert_info.SetString("general.title", l10n_util::GetStringFUTF8(
-      IDS_CERT_INFO_DIALOG_TITLE, UTF8ToUTF16(x509_certificate_model::GetTitle(
+      IDS_CERT_INFO_DIALOG_TITLE,
+      base::UTF8ToUTF16(x509_certificate_model::GetTitle(
           cert_chain.front()))));
 
   // Issued to information.
@@ -141,9 +142,9 @@ std::string CertificateViewerDialog::GetDialogArgs() const {
   base::Time issued, expires;
   std::string issued_str, expires_str;
   if (x509_certificate_model::GetTimes(cert_hnd, &issued, &expires)) {
-    issued_str = UTF16ToUTF8(
+    issued_str = base::UTF16ToUTF8(
         base::TimeFormatShortDateNumeric(issued));
-    expires_str = UTF16ToUTF8(
+    expires_str = base::UTF16ToUTF8(
         base::TimeFormatShortDateNumeric(expires));
   } else {
     issued_str = alternative_text;
@@ -266,7 +267,7 @@ void CertificateViewerDialogHandler::RequestCertificateFields(
   if (!version.empty())
     node_details->SetString("payload.val",
         l10n_util::GetStringFUTF8(IDS_CERT_DETAILS_VERSION_FORMAT,
-                                  UTF8ToUTF16(version)));
+                                  base::UTF8ToUTF16(version)));
 
   cert_fields->Append(node_details = new base::DictionaryValue());
   node_details->SetString("label",
@@ -302,9 +303,9 @@ void CertificateViewerDialogHandler::RequestCertificateFields(
   base::Time issued, expires;
   if (x509_certificate_model::GetTimes(cert, &issued, &expires)) {
     node_details->SetString("payload.val",
-        UTF16ToUTF8(base::TimeFormatShortDateAndTime(issued)));
+        base::UTF16ToUTF8(base::TimeFormatShortDateAndTime(issued)));
     alt_node_details->SetString("payload.val",
-        UTF16ToUTF8(base::TimeFormatShortDateAndTime(expires)));
+        base::UTF16ToUTF8(base::TimeFormatShortDateAndTime(expires)));
   }
 
   cert_fields->Append(node_details = new base::DictionaryValue());
diff --git a/chrome/browser/ui/webui/chromeos/charger_replacement_handler.cc b/chrome/browser/ui/webui/chromeos/charger_replacement_handler.cc
index 77f077a..eff6f55 100644
--- a/chrome/browser/ui/webui/chromeos/charger_replacement_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/charger_replacement_handler.cc
@@ -291,7 +291,7 @@ void ChargerReplacementHandler::ConfirmStillUseBadCharger(
 }
 
 void ChargerReplacementHandler::ShowLink(const base::ListValue* args) {
-  std::string url = UTF16ToUTF8(ExtractStringValue(args));
+  std::string url = base::UTF16ToUTF8(ExtractStringValue(args));
   ChargerLinkDialog* dialog = new ChargerLinkDialog(charger_window_, url);
   dialog->Show();
 }
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
index 4e7f778..1442ece 100644
--- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
@@ -76,7 +76,7 @@ content::WebUIDataSource* CreateImageburnerUIHTMLSource() {
   source->AddLocalizedString("confirmButton", IDS_IMAGEBURN_CONFIRM_BUTTON);
   source->AddLocalizedString("cancelButton", IDS_IMAGEBURN_CANCEL_BUTTON);
   source->AddLocalizedString("retryButton", IDS_IMAGEBURN_RETRY_BUTTON);
-  source->AddString("moreInfoLink", ASCIIToUTF16(kMoreInfoLink));
+  source->AddString("moreInfoLink", base::ASCIIToUTF16(kMoreInfoLink));
 
   source->SetJsonPath("strings.js");
   source->AddResourcePath("image_burner.js", IDR_IMAGEBURNER_JS);
@@ -186,7 +186,7 @@ class WebUIHandler
  private:
   void CreateDiskValue(const disks::DiskMountManager::Disk& disk,
                        base::DictionaryValue* disk_value) {
-    base::string16 label = ASCIIToUTF16(disk.drive_label());
+    base::string16 label = base::ASCIIToUTF16(disk.drive_label());
     base::i18n::AdjustStringForLocaleDirection(&label);
     disk_value->SetString(std::string(kPropertyLabel), label);
     disk_value->SetString(std::string(kPropertyFilePath), disk.file_path());
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 5074b90..918d498 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -255,7 +255,8 @@ content::WebUIDataSource* CreateKeyboardOverlayUIHTMLSource() {
                                kI18nContentToMessage[i].message);
   }
 
-  source->AddString("keyboardOverlayLearnMoreURL", UTF8ToUTF16(kLearnMoreURL));
+  source->AddString("keyboardOverlayLearnMoreURL",
+                    base::UTF8ToUTF16(kLearnMoreURL));
   source->AddBoolean("keyboardOverlayHasChromeOSDiamondKey",
                      CommandLine::ForCurrentProcess()->HasSwitch(
                          chromeos::switches::kHasChromeOSDiamondKey));
diff --git a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc
index 635aaf5..fc13c12 100644
--- a/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc
@@ -64,13 +64,13 @@ void LocallyManagedUserCreationScreenHandler::DeclareLocalizedValues(
                IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_2);
   builder->AddF("createManagedUserIntroText3",
                IDS_CREATE_LOCALLY_MANAGED_INTRO_TEXT_3,
-               UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
+               base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
 
   builder->Add("createManagedUserPickManagerTitle",
                IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_TITLE);
   builder->AddF("createManagedUserPickManagerTitleExplanation",
                IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PICK_MANAGER_EXPLANATION,
-               UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
+               base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
   builder->Add("createManagedUserManagerPasswordHint",
                IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_MANAGER_PASSWORD_HINT);
   builder->Add("createManagedUserWrongManagerPasswordText",
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 275fdf3..2f4e209 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -443,7 +443,7 @@ void SigninScreenHandler::DeclareLocalizedValues(
                IDS_LOGIN_PUBLIC_ACCOUNT_ENTER_ACCESSIBLE_NAME);
   builder->AddF("removeUserWarningText",
                IDS_LOGIN_POD_USER_REMOVE_WARNING,
-               UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
+               base::UTF8ToUTF16(chrome::kSupervisedUserManagementDisplayURL));
   builder->Add("removeUserWarningButtonTitle",
                IDS_LOGIN_POD_USER_REMOVE_WARNING_BUTTON);
 
@@ -1380,8 +1380,8 @@ void SigninScreenHandler::HandleLoginWebuiReady() {
     const char code[] = "gWindowOnLoad();";
     RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
     rvh->ExecuteJavascriptInWebFrame(
-        ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
-        ASCIIToUTF16(code));
+        base::ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
+        base::ASCIIToUTF16(code));
   }
   if (!gaia_silent_load_) {
     content::NotificationService::current()->Notify(
@@ -1397,8 +1397,8 @@ void SigninScreenHandler::HandleLoginWebuiReady() {
                         "window.onload=function() {};";
     RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
     rvh->ExecuteJavascriptInWebFrame(
-        ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
-        ASCIIToUTF16(code));
+        base::ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
+        base::ASCIIToUTF16(code));
     // As we could miss and window.onload could already be called, restore
     // focus to current pod (see crbug/175243).
     RefocusCurrentPod();
@@ -1659,8 +1659,8 @@ void SigninScreenHandler::SubmitLoginFormForTest() {
 
   RenderViewHost* rvh = web_ui()->GetWebContents()->GetRenderViewHost();
   rvh->ExecuteJavascriptInWebFrame(
-      ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
-      ASCIIToUTF16(code));
+      base::ASCIIToUTF16("//iframe[@id='signin-frame']\n//iframe"),
+      base::ASCIIToUTF16(code));
 
   // Test properties are cleared in HandleCompleteLogin because the form
   // submission might fail and login will not be attempted after reloading
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 9e8663b..6a7f792f 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -315,7 +315,7 @@ void MobileSetupUIHTMLSource::GetPropertiesAndStartDataRequest(
 
   strings.SetString("connecting_header",
                     l10n_util::GetStringFUTF16(IDS_MOBILE_CONNECTING_HEADER,
-                                               UTF8ToUTF16(name)));
+                                               base::UTF8ToUTF16(name)));
   strings.SetString("error_header",
                     l10n_util::GetStringUTF16(IDS_MOBILE_ERROR_HEADER));
   strings.SetString("activating_header",
@@ -642,7 +642,7 @@ void MobileSetupUI::DidCommitProvisionalLoadForFrame(
     const GURL& url,
     content::PageTransition transition_type,
     content::RenderViewHost* render_view_host) {
-  if (frame_unique_name != UTF8ToUTF16("paymentForm"))
+  if (frame_unique_name != base::UTF8ToUTF16("paymentForm"))
     return;
 
   web_ui()->CallJavascriptFunction(
@@ -657,7 +657,7 @@ void MobileSetupUI::DidFailProvisionalLoad(
     int error_code,
     const base::string16& error_description,
     content::RenderViewHost* render_view_host) {
-  if (frame_unique_name != UTF8ToUTF16("paymentForm"))
+  if (frame_unique_name != base::UTF8ToUTF16("paymentForm"))
     return;
 
   base::FundamentalValue result_value(-error_code);
diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc
index 1db24c4..3ee3cc9 100644
--- a/chrome/browser/ui/webui/cookies_tree_model_util.cc
+++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc
@@ -124,9 +124,9 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
           l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_NO) :
           l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_YES);
       dict->SetString(kKeyAccessibleToScript, accessible);
-      dict->SetString(kKeyCreated, UTF16ToUTF8(
+      dict->SetString(kKeyCreated, base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(cookie.CreationDate())));
-      dict->SetString(kKeyExpires, cookie.IsPersistent() ? UTF16ToUTF8(
+      dict->SetString(kKeyExpires, cookie.IsPersistent() ? base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate())) :
           l10n_util::GetStringUTF8(IDS_COOKIES_COOKIE_EXPIRES_SESSION));
 
@@ -144,7 +144,7 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
           database_info.database_name);
       dict->SetString(kKeyDesc, database_info.description);
       dict->SetString(kKeySize, ui::FormatBytes(database_info.size));
-      dict->SetString(kKeyModified, UTF16ToUTF8(
+      dict->SetString(kKeyModified, base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(database_info.last_modified)));
 
       break;
@@ -158,7 +158,7 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
 
       dict->SetString(kKeyOrigin, local_storage_info.origin_url.spec());
       dict->SetString(kKeySize, ui::FormatBytes(local_storage_info.size));
-      dict->SetString(kKeyModified, UTF16ToUTF8(
+      dict->SetString(kKeyModified, base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(
               local_storage_info.last_modified)));
 
@@ -173,9 +173,9 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
 
       dict->SetString(kKeyManifest, appcache_info.manifest_url.spec());
       dict->SetString(kKeySize, ui::FormatBytes(appcache_info.size));
-      dict->SetString(kKeyCreated, UTF16ToUTF8(
+      dict->SetString(kKeyCreated, base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(appcache_info.creation_time)));
-      dict->SetString(kKeyAccessed, UTF16ToUTF8(
+      dict->SetString(kKeyAccessed, base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(appcache_info.last_access_time)));
 
       break;
@@ -189,7 +189,7 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
 
       dict->SetString(kKeyOrigin, indexed_db_info.origin_.spec());
       dict->SetString(kKeySize, ui::FormatBytes(indexed_db_info.size_));
-      dict->SetString(kKeyModified, UTF16ToUTF8(
+      dict->SetString(kKeyModified, base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(indexed_db_info.last_modified_)));
 
       break;
@@ -206,13 +206,13 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
       dict->SetString(kKeyOrigin, file_system_info.origin.spec());
       dict->SetString(kKeyPersistent,
                       ContainsKey(file_system_info.usage_map, kPerm) ?
-                          UTF16ToUTF8(ui::FormatBytes(
+                          base::UTF16ToUTF8(ui::FormatBytes(
                               file_system_info.usage_map.find(kPerm)->second)) :
                           l10n_util::GetStringUTF8(
                               IDS_COOKIES_FILE_SYSTEM_USAGE_NONE));
       dict->SetString(kKeyTemporary,
                       ContainsKey(file_system_info.usage_map, kTemp) ?
-                          UTF16ToUTF8(ui::FormatBytes(
+                          base::UTF16ToUTF8(ui::FormatBytes(
                               file_system_info.usage_map.find(kTemp)->second)) :
                           l10n_util::GetStringUTF8(
                               IDS_COOKIES_FILE_SYSTEM_USAGE_NONE));
@@ -230,14 +230,14 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
 
       dict->SetString(kKeyOrigin, quota_info.host);
       dict->SetString(kKeyTotalUsage,
-                      UTF16ToUTF8(ui::FormatBytes(
+                      base::UTF16ToUTF8(ui::FormatBytes(
                           quota_info.temporary_usage +
                           quota_info.persistent_usage)));
       dict->SetString(kKeyTemporaryUsage,
-                      UTF16ToUTF8(ui::FormatBytes(
+                      base::UTF16ToUTF8(ui::FormatBytes(
                           quota_info.temporary_usage)));
       dict->SetString(kKeyPersistentUsage,
-                      UTF16ToUTF8(ui::FormatBytes(
+                      base::UTF16ToUTF8(ui::FormatBytes(
                           quota_info.persistent_usage)));
       break;
     }
@@ -251,7 +251,7 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary(
       dict->SetString(kKeyServerId, server_bound_cert.server_identifier());
       dict->SetString(kKeyCertType,
                       ClientCertTypeToString(net::CLIENT_CERT_ECDSA_SIGN));
-      dict->SetString(kKeyCreated, UTF16ToUTF8(
+      dict->SetString(kKeyCreated, base::UTF16ToUTF8(
           base::TimeFormatFriendlyDateAndTime(
               server_bound_cert.creation_time())));
       break;
diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.cc b/chrome/browser/ui/webui/extensions/extension_info_ui.cc
index b494ccf..fa26fa3 100644
--- a/chrome/browser/ui/webui/extensions/extension_info_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extension_info_ui.cc
@@ -74,7 +74,7 @@ void ExtensionInfoUI::AddExtensionDataToSource(
                                       extension_misc::EXTENSION_ICON_MEDIUM,
                                       ExtensionIconSet::MATCH_BIGGER,
                                       false, NULL);
-  source_->AddString("icon", UTF8ToUTF16(icon.spec()));
+  source_->AddString("icon", base::UTF8ToUTF16(icon.spec()));
   // Set the last update time (the install time).
   base::Time install_time = extension_service->extension_prefs()->
       GetInstallTime(extension_id);
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 7662588..e266746 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -363,12 +363,12 @@ void ExtensionSettingsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_NONE_INSTALLED));
   source->AddString("extensionSettingsSuggestGallery",
       l10n_util::GetStringFUTF16(IDS_EXTENSIONS_NONE_INSTALLED_SUGGEST_GALLERY,
-          ASCIIToUTF16(google_util::AppendGoogleLocaleParam(
+          base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam(
               GURL(extension_urls::GetExtensionGalleryURL())).spec())));
   source->AddString("extensionSettingsGetMoreExtensions",
       l10n_util::GetStringUTF16(IDS_GET_MORE_EXTENSIONS));
   source->AddString("extensionSettingsGetMoreExtensionsUrl",
-      ASCIIToUTF16(google_util::AppendGoogleLocaleParam(
+      base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam(
           GURL(extension_urls::GetExtensionGalleryURL())).spec()));
   source->AddString("extensionSettingsExtensionId",
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_ID));
@@ -421,7 +421,7 @@ void ExtensionSettingsHandler::GetLocalizedValues(
   source->AddString("extensionSettingsSuspiciousInstallLearnMore",
       l10n_util::GetStringUTF16(IDS_LEARN_MORE));
   source->AddString("extensionSettingsSuspiciousInstallHelpUrl",
-      ASCIIToUTF16(google_util::AppendGoogleLocaleParam(
+      base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam(
           GURL(chrome::kRemoveNonCWSExtensionURL)).spec()));
   source->AddString("extensionSettingsUseAppsDevTools",
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_USE_APPS_DEV_TOOLS));
@@ -819,7 +819,7 @@ void ExtensionSettingsHandler::HandleLaunchMessage(
 
 void ExtensionSettingsHandler::HandleReloadMessage(
     const base::ListValue* args) {
-  std::string extension_id = UTF16ToUTF8(ExtractStringValue(args));
+  std::string extension_id = base::UTF16ToUTF8(ExtractStringValue(args));
   CHECK(!extension_id.empty());
   extension_service_->ReloadExtension(extension_id);
 }
@@ -952,7 +952,7 @@ void ExtensionSettingsHandler::HandleOptionsMessage(
 
 void ExtensionSettingsHandler::HandlePermissionsMessage(
     const base::ListValue* args) {
-  std::string extension_id(UTF16ToUTF8(ExtractStringValue(args)));
+  std::string extension_id(base::UTF16ToUTF8(ExtractStringValue(args)));
   CHECK(!extension_id.empty());
   const Extension* extension =
       extension_service_->GetExtensionById(extension_id, true);
@@ -1032,7 +1032,7 @@ void ExtensionSettingsHandler::ShowAlert(const std::string& message) {
 
 const Extension* ExtensionSettingsHandler::GetActiveExtension(
     const base::ListValue* args) {
-  std::string extension_id = UTF16ToUTF8(ExtractStringValue(args));
+  std::string extension_id = base::UTF16ToUTF8(ExtractStringValue(args));
   CHECK(!extension_id.empty());
   return extension_service_->GetExtensionById(extension_id, false);
 }
@@ -1233,7 +1233,7 @@ void ExtensionSettingsHandler::OnRequirementsChecked(
     extension_service_->EnableExtension(extension_id);
   } else {
     ExtensionErrorReporter::GetInstance()->ReportError(
-        UTF8ToUTF16(JoinString(requirement_errors, ' ')),
+        base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
         true /* be noisy */);
   }
   requirements_checker_.reset();
diff --git a/chrome/browser/ui/webui/extensions/install_extension_handler.cc b/chrome/browser/ui/webui/extensions/install_extension_handler.cc
index 83e22ef..e003047 100644
--- a/chrome/browser/ui/webui/extensions/install_extension_handler.cc
+++ b/chrome/browser/ui/webui/extensions/install_extension_handler.cc
@@ -110,12 +110,14 @@ void InstallExtensionHandler::HandleInstallMessage(
 
   const bool kCaseSensitive = false;
 
-  if (EndsWith(file_display_name_, ASCIIToUTF16(".user.js"), kCaseSensitive)) {
+  if (EndsWith(file_display_name_,
+      base::ASCIIToUTF16(".user.js"),
+      kCaseSensitive)) {
     crx_installer->InstallUserScript(
         file_to_install_,
         net::FilePathToFileURL(file_to_install_));
   } else if (EndsWith(file_display_name_,
-                      ASCIIToUTF16(".crx"),
+                      base::ASCIIToUTF16(".crx"),
                       kCaseSensitive)) {
     crx_installer->InstallCrx(file_to_install_);
   } else {
diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc
index a68d3b2..717fb51 100644
--- a/chrome/browser/ui/webui/extensions/pack_extension_handler.cc
+++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.cc
@@ -70,7 +70,7 @@ void PackExtensionHandler::OnPackSuccess(const base::FilePath& crx_file,
                                          const base::FilePath& pem_file) {
   base::ListValue arguments;
   arguments.Append(base::Value::CreateStringValue(
-      UTF16ToUTF8(PackExtensionJob::StandardSuccessMessage(
+      base::UTF16ToUTF8(PackExtensionJob::StandardSuccessMessage(
           crx_file, pem_file))));
   web_ui()->CallJavascriptFunction(
       "extensions.PackExtensionOverlay.showSuccessMessage", arguments);
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index f493e41..c058268 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -80,7 +80,7 @@ content::WebUIDataSource* CreateFlagsUIHTMLSource() {
     chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
     source->AddString("ownerWarning",
                       l10n_util::GetStringFUTF16(IDS_SYSTEM_FLAGS_OWNER_ONLY,
-                                                 UTF8ToUTF16(owner)));
+                                                 base::UTF8ToUTF16(owner)));
   } else {
     // The warning will be only shown on ChromeOS, when the current user is not
     // the owner.
diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc
index 7aa142f..7c92f4d 100644
--- a/chrome/browser/ui/webui/flash_ui.cc
+++ b/chrome/browser/ui/webui/flash_ui.cc
@@ -47,6 +47,7 @@
 #include "base/win/windows_version.h"
 #endif
 
+using base::ASCIIToUTF16;
 using content::GpuDataManager;
 using content::PluginService;
 using content::UserMetricsAction;
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index 57b2a63..4f6e39c 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -75,7 +75,7 @@ base::string16 BuildBrowserVersionString() {
   browser_version += ")";
 #endif
 
-  return UTF8ToUTF16(browser_version);
+  return base::UTF8ToUTF16(browser_version);
 }
 
 #if defined(OS_CHROMEOS)
@@ -229,14 +229,14 @@ void HelpHandler::GetLocalizedValues(content::WebUIDataSource* source) {
 
   base::string16 license = l10n_util::GetStringFUTF16(
       IDS_ABOUT_VERSION_LICENSE,
-      ASCIIToUTF16(chrome::kChromiumProjectURL),
-      ASCIIToUTF16(chrome::kChromeUICreditsURL));
+      base::ASCIIToUTF16(chrome::kChromiumProjectURL),
+      base::ASCIIToUTF16(chrome::kChromeUICreditsURL));
   source->AddString("productLicense", license);
 
 #if defined(OS_CHROMEOS)
   base::string16 os_license = l10n_util::GetStringFUTF16(
       IDS_ABOUT_CROS_VERSION_LICENSE,
-      ASCIIToUTF16(chrome::kChromeUIOSCreditsURL));
+      base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL));
   source->AddString("productOsLicense", os_license);
 
   base::string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
@@ -258,7 +258,7 @@ void HelpHandler::GetLocalizedValues(content::WebUIDataSource* source) {
 #endif
 
   base::string16 tos = l10n_util::GetStringFUTF16(
-      IDS_ABOUT_TERMS_OF_SERVICE, UTF8ToUTF16(chrome::kChromeUITermsURL));
+      IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL));
   source->AddString("productTOS", tos);
 
   source->AddString("webkitVersion", webkit_glue::GetWebKitVersion());
@@ -401,7 +401,8 @@ void HelpHandler::SetChannel(const base::ListValue* args) {
     return;
   }
 
-  version_updater_->SetChannel(UTF16ToUTF8(channel), is_powerwash_allowed);
+  version_updater_->SetChannel(base::UTF16ToUTF8(channel),
+                               is_powerwash_allowed);
   if (chromeos::UserManager::Get()->IsCurrentUserOwner()) {
     // Check for update after switching release channel.
     version_updater_->CheckForUpdate(base::Bind(&HelpHandler::SetUpdateStatus,
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index b9e3a85..7f9a513 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -140,7 +140,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) {
   source->AddString(
       "deleteWarning",
       l10n_util::GetStringFUTF16(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING,
-                                 UTF8ToUTF16(kIncognitoModeShortcut)));
+                                 base::UTF8ToUTF16(kIncognitoModeShortcut)));
   source->AddLocalizedString("actionMenuDescription",
                              IDS_HISTORY_ACTION_MENU_DESCRIPTION);
   source->AddLocalizedString("removeFromHistory", IDS_HISTORY_REMOVE_PAGE);
@@ -294,7 +294,7 @@ void BrowsingHistoryHandler::HistoryEntry::SetUrlAndTitle(
   base::string16 title_to_set(title);
   if (title.empty()) {
     using_url_as_the_title = true;
-    title_to_set = UTF8ToUTF16(url.spec());
+    title_to_set = base::UTF8ToUTF16(url.spec());
   }
 
   // Since the title can contain BiDi text, we need to mark the text as either
@@ -321,7 +321,7 @@ scoped_ptr<base::DictionaryValue> BrowsingHistoryHandler::HistoryEntry::ToValue(
   // When the domain is empty, use the scheme instead. This allows for a
   // sensible treatment of e.g. file: URLs when group by domain is on.
   if (domain.empty())
-    domain = UTF8ToUTF16(url.scheme() + ":");
+    domain = base::UTF8ToUTF16(url.scheme() + ":");
 
   result->SetString("domain", domain);
   result->SetDouble("time", time.ToJsTime());
@@ -1004,7 +1004,7 @@ HistoryUI::HistoryUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 // static
 const GURL HistoryUI::GetHistoryURLWithSearchText(const base::string16& text) {
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
-              net::EscapeQueryParamValue(UTF16ToUTF8(text), true));
+              net::EscapeQueryParamValue(base::UTF16ToUTF8(text), true));
 }
 
 // static
diff --git a/chrome/browser/ui/webui/identity_internals_ui.cc b/chrome/browser/ui/webui/identity_internals_ui.cc
index d4c716a..2a32f34 100644
--- a/chrome/browser/ui/webui/identity_internals_ui.cc
+++ b/chrome/browser/ui/webui/identity_internals_ui.cc
@@ -197,7 +197,7 @@ const base::string16 IdentityInternalsUIMessageHandler::GetStatus(
 
 const std::string IdentityInternalsUIMessageHandler::GetExpirationTime(
     const extensions::IdentityTokenCacheValue& token_cache_value) {
-  return UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
+  return base::UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
       token_cache_value.expiration_time()));
 }
 
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
index 6ceebda..d65749f 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
@@ -607,7 +607,7 @@ void LocalDiscoveryUIHandler::SetupCloudPrintConnectorSection() {
     label_str = l10n_util::GetStringFUTF16(
         IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_LABEL,
         l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT),
-        UTF8ToUTF16(email));
+        base::UTF8ToUTF16(email));
   }
   base::StringValue label(label_str);
 
diff --git a/chrome/browser/ui/webui/metrics_handler.cc b/chrome/browser/ui/webui/metrics_handler.cc
index fc99e24..6cb8309 100644
--- a/chrome/browser/ui/webui/metrics_handler.cc
+++ b/chrome/browser/ui/webui/metrics_handler.cc
@@ -44,7 +44,7 @@ void MetricsHandler::RegisterMessages() {
 }
 
 void MetricsHandler::HandleRecordAction(const base::ListValue* args) {
-  std::string string_action = UTF16ToUTF8(ExtractStringValue(args));
+  std::string string_action = base::UTF16ToUTF8(ExtractStringValue(args));
   content::RecordComputedAction(string_action);
 }
 
@@ -83,7 +83,7 @@ void MetricsHandler::HandleRecordInHistogram(const base::ListValue* args) {
 }
 
 void MetricsHandler::HandleLogEventTime(const base::ListValue* args) {
-  std::string event_name = UTF16ToUTF8(ExtractStringValue(args));
+  std::string event_name = base::UTF16ToUTF8(ExtractStringValue(args));
   WebContents* tab = web_ui()->GetWebContents();
 
   // Not all new tab pages get timed. In those cases, we don't have a
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc
index 9d8668c..ae977a5 100644
--- a/chrome/browser/ui/webui/nacl_ui.cc
+++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -43,6 +43,7 @@
 #include "base/win/windows_version.h"
 #endif
 
+using base::ASCIIToUTF16;
 using content::BrowserThread;
 using content::PluginService;
 using content::UserMetricsAction;
diff --git a/chrome/browser/ui/webui/net_export_ui.cc b/chrome/browser/ui/webui/net_export_ui.cc
index 391fbeb..d4182f2 100644
--- a/chrome/browser/ui/webui/net_export_ui.cc
+++ b/chrome/browser/ui/webui/net_export_ui.cc
@@ -221,8 +221,9 @@ void NetExportMessageHandler::SendEmail(const base::FilePath& file_to_send) {
       "Please add some informative text about the network issues.";
   base::FilePath::StringType file_to_attach(file_to_send.value());
   chrome::android::SendEmail(
-      UTF8ToUTF16(email), UTF8ToUTF16(subject),
-      UTF8ToUTF16(body), UTF8ToUTF16(title), UTF8ToUTF16(file_to_attach));
+      base::UTF8ToUTF16(email), base::UTF8ToUTF16(subject),
+      base::UTF8ToUTF16(body), base::UTF8ToUTF16(title),
+      base::UTF8ToUTF16(file_to_attach));
 #endif
 }
 
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index f8de745..1058e07 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -1196,7 +1196,7 @@ void NetInternalsMessageHandler::IOThreadImpl::OnStartConnectionTests(
 
   // Try to fix-up the user provided URL into something valid.
   // For example, turn "www.google.com" into "http://www.google.com".
-  GURL url(URLFixerUpper::FixupURL(UTF16ToUTF8(url_str), std::string()));
+  GURL url(URLFixerUpper::FixupURL(base::UTF16ToUTF8(url_str), std::string()));
 
   connection_tester_.reset(new ConnectionTester(
       this,
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
index 0f0f893..677aadd 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -277,7 +277,8 @@ void NetInternalsTest::MessageHandler::NavigateToPrerender(
     const base::ListValue* list_value) {
   content::RenderViewHost* host =
       browser()->tab_strip_model()->GetWebContentsAt(1)->GetRenderViewHost();
-  host->ExecuteJavascriptInWebFrame(base::string16(), ASCIIToUTF16("Click()"));
+  host->ExecuteJavascriptInWebFrame(base::string16(),
+                                    base::ASCIIToUTF16("Click()"));
 }
 
 void NetInternalsTest::MessageHandler::CreateIncognitoBrowser(
diff --git a/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc b/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc
index e028dd8..dd5af3c 100644
--- a/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc
+++ b/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc
@@ -149,7 +149,7 @@ void NTPResourceCache::CreateNewTabHTML() {
       bookmark_shortcuts_allowed ? "true" : "false");
 
   const char* new_tab_link = kLearnMoreIncognitoUrl;
-  base::string16 learnMoreLink = ASCIIToUTF16(
+  base::string16 learnMoreLink = base::ASCIIToUTF16(
       google_util::AppendGoogleLocaleParam(GURL(new_tab_link)).spec());
   localized_strings.SetString("content",
       l10n_util::GetStringFUTF16(
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index de50b25..487e1bf 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -115,14 +115,14 @@ void AppLauncherHandler::CreateAppInfo(
 
   // The Extension class 'helpfully' wraps bidi control characters that
   // impede our ability to determine directionality.
-  base::string16 short_name = UTF8ToUTF16(extension->short_name());
+  base::string16 short_name = base::UTF8ToUTF16(extension->short_name());
   base::i18n::UnadjustStringForLocaleDirection(&short_name);
   NewTabUI::SetUrlTitleAndDirection(
       value,
       short_name,
       extensions::AppLaunchInfo::GetFullLaunchURL(extension));
 
-  base::string16 name = UTF8ToUTF16(extension->name());
+  base::string16 name = base::UTF8ToUTF16(extension->name());
   base::i18n::UnadjustStringForLocaleDirection(&name);
   NewTabUI::SetFullNameAndDirection(name, value);
 
diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc
index b549e87..c5455cb 100644
--- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc
+++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc
@@ -173,7 +173,7 @@ void MostVisitedHandler::StartQueryForMostVisited() {
 }
 
 void MostVisitedHandler::HandleBlacklistUrl(const base::ListValue* args) {
-  std::string url = UTF16ToUTF8(ExtractStringValue(args));
+  std::string url = base::UTF16ToUTF8(ExtractStringValue(args));
   BlacklistUrl(GURL(url));
 }
 
diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
index 8f52426..4395c33 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.cc
@@ -120,7 +120,8 @@ void NewTabPageSyncHandler::BuildAndSendSyncStatus() {
                                                  &status_msg,
                                                  &link_text);
   SendSyncMessageToPage(FromSyncStatusMessageType(type),
-                        UTF16ToUTF8(status_msg), UTF16ToUTF8(link_text));
+                        base::UTF16ToUTF8(status_msg),
+                        base::UTF16ToUTF8(link_text));
 }
 
 void NewTabPageSyncHandler::HandleSyncLinkClicked(const base::ListValue* args) {
@@ -134,7 +135,7 @@ void NewTabPageSyncHandler::HandleSyncLinkClicked(const base::ListValue* args) {
   chrome::ShowBrowserSignin(browser, signin::SOURCE_NTP_LINK);
 
   if (sync_service_->HasSyncSetupCompleted()) {
-    base::string16 user = UTF8ToUTF16(SigninManagerFactory::GetForProfile(
+    base::string16 user = base::UTF8ToUTF16(SigninManagerFactory::GetForProfile(
         Profile::FromWebUI(web_ui()))->GetAuthenticatedUsername());
     base::DictionaryValue value;
     value.SetString("syncEnabledMessage",
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
index bb58899..2392516 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -297,7 +297,7 @@ void NewTabUI::SetUrlTitleAndDirection(base::DictionaryValue* dictionary,
   base::string16 title_to_set(title);
   if (title_to_set.empty()) {
     using_url_as_the_title = true;
-    title_to_set = UTF8ToUTF16(gurl.spec());
+    title_to_set = base::UTF8ToUTF16(gurl.spec());
   }
 
   // We set the "dir" attribute of the title, so that in RTL locales, a LTR
diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
index 0671359..f2ec735 100644
--- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc
@@ -71,8 +71,8 @@ SkBitmap GetGAIAPictureForNTP(const gfx::Image& image) {
 // Puts the |content| into a span with the given CSS class.
 base::string16 CreateSpanWithClass(const base::string16& content,
                                    const std::string& css_class) {
-  return ASCIIToUTF16("<span class='" + css_class + "'>") +
-      net::EscapeForHTML(content) + ASCIIToUTF16("</span>");
+  return base::ASCIIToUTF16("<span class='" + css_class + "'>") +
+      net::EscapeForHTML(content) + base::ASCIIToUTF16("</span>");
 }
 
 } // namespace
@@ -220,8 +220,10 @@ void NTPLoginHandler::UpdateLogin() {
         if (image)
           icon_url = webui::GetBitmapDataUrl(GetGAIAPictureForNTP(*image));
       }
-      if (header.empty())
-        header = CreateSpanWithClass(UTF8ToUTF16(username), "profile-name");
+      if (header.empty()) {
+        header = CreateSpanWithClass(base::UTF8ToUTF16(username),
+                                     "profile-name");
+      }
     }
   } else {
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index deb62e7..2c3d910 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -82,7 +82,7 @@ const char kLearnMoreGuestSessionUrl[] =
     "https://www.google.com/support/chromeos/bin/answer.py?answer=1057090";
 
 base::string16 GetUrlWithLang(const GURL& url) {
-  return ASCIIToUTF16(google_util::AppendGoogleLocaleParam(url).spec());
+  return base::ASCIIToUTF16(google_util::AppendGoogleLocaleParam(url).spec());
 }
 
 std::string SkColorToRGBAString(SkColor color) {
@@ -311,7 +311,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
       localized_strings.SetString("enterpriseInfoVisible", "true");
       base::string16 enterprise_info = l10n_util::GetStringFUTF16(
           IDS_DEVICE_OWNED_BY_NOTICE,
-          UTF8ToUTF16(enterprise_domain));
+          base::UTF8ToUTF16(enterprise_domain));
       localized_strings.SetString("enterpriseInfoMessage", enterprise_info);
       localized_strings.SetString("learnMore",
           l10n_util::GetStringUTF16(IDS_LEARN_MORE));
@@ -329,7 +329,7 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() {
       l10n_util::GetStringFUTF16(
           IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-          ASCIIToUTF16(chrome::kChromeUIExtensionsURL)));
+          base::ASCIIToUTF16(chrome::kChromeUIExtensionsURL)));
   bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean(
       prefs::kShowBookmarkBar);
   localized_strings.SetBoolean("bookmarkbarattached", bookmark_bar_attached);
diff --git a/chrome/browser/ui/webui/ntp/ntp_user_data_logger.cc b/chrome/browser/ui/webui/ntp/ntp_user_data_logger.cc
index 1204461..4fca77a 100644
--- a/chrome/browser/ui/webui/ntp/ntp_user_data_logger.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_user_data_logger.cc
@@ -129,7 +129,7 @@ void NTPUserDataLogger::LogImpression(int position,
   // generated dynamically.
   base::HistogramBase* counter = base::LinearHistogram::FactoryGet(
       base::StringPrintf(kImpressionHistogramWithProvider,
-                         UTF16ToUTF8(provider).c_str()),
+                         base::UTF16ToUTF8(provider).c_str()),
       1, MostVisitedIframeSource::kNumMostVisited,
       MostVisitedIframeSource::kNumMostVisited + 1,
       base::Histogram::kUmaTargetedHistogramFlag);
diff --git a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc
index 0f3a5b6..396d9eb 100644
--- a/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc
+++ b/chrome/browser/ui/webui/ntp/suggestions_page_handler.cc
@@ -141,7 +141,7 @@ void SuggestionsHandler::SendPagesValue() {
 }
 
 void SuggestionsHandler::HandleBlacklistURL(const base::ListValue* args) {
-  std::string url = UTF16ToUTF8(ExtractStringValue(args));
+  std::string url = base::UTF16ToUTF8(ExtractStringValue(args));
   BlacklistURL(GURL(url));
 }
 
diff --git a/chrome/browser/ui/webui/ntp/suggestions_source_discovery.cc b/chrome/browser/ui/webui/ntp/suggestions_source_discovery.cc
index 257c3d6..ef4322e 100644
--- a/chrome/browser/ui/webui/ntp/suggestions_source_discovery.cc
+++ b/chrome/browser/ui/webui/ntp/suggestions_source_discovery.cc
@@ -73,7 +73,7 @@ void SuggestionsSourceDiscovery::FetchItems(Profile* profile) {
        it != list->end(); ++it) {
     base::DictionaryValue* page_value = new base::DictionaryValue();
     NewTabUI::SetUrlTitleAndDirection(page_value,
-                                      ASCIIToUTF16((*it)->link_text()),
+                                      base::ASCIIToUTF16((*it)->link_text()),
                                       GURL((*it)->link_url()));
     page_value->SetDouble("score", (*it)->score());
     const std::string& url_image = (*it)->url_image();
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
index 6e35ec3..33c324a 100644
--- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
+++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc
@@ -168,7 +168,7 @@ bool OmniboxUIHandler::LookupIsTypedHost(const base::string16& host,
   history::URLDatabase* url_db = history_service->InMemoryDatabase();
   if (!url_db)
     return false;
-  *is_typed_host = url_db->IsTypedHost(UTF16ToUTF8(host));
+  *is_typed_host = url_db->IsTypedHost(base::UTF16ToUTF8(host));
   return true;
 }
 
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index 34b8df1..99d79a7 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -547,7 +547,7 @@ void AutofillOptionsHandler::SetAddress(const base::ListValue* args) {
 
   if (args->GetString(8, &country_code))
     profile.SetRawInfo(autofill::ADDRESS_HOME_COUNTRY,
-                       ASCIIToUTF16(country_code));
+                       base::ASCIIToUTF16(country_code));
 
   if (args->GetList(9, &list_value))
     SetValueList(list_value, autofill::PHONE_HOME_WHOLE_NUMBER, &profile);
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 44f0d63..60681d6 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -472,7 +472,7 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
 #endif
 
   values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL);
-  base::string16 omnibox_url = ASCIIToUTF16(chrome::kOmniboxLearnMoreURL);
+  base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL);
   values->SetString(
       "defaultSearchGroupLabel",
       l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url));
@@ -867,8 +867,10 @@ void BrowserOptionsHandler::CheckAutoLaunch(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Auto-launch is not supported for secondary profiles yet.
-  if (profile_path.BaseName().value() != ASCIIToUTF16(chrome::kInitialProfile))
+  if (profile_path.BaseName().value() !=
+          base::ASCIIToUTF16(chrome::kInitialProfile)) {
     return;
+  }
 
   // Pass in weak pointer to this to avoid race if BrowserOptionsHandler is
   // deleted.
@@ -1485,7 +1487,7 @@ void BrowserOptionsHandler::SetupCloudPrintConnectorSection() {
     label_str = l10n_util::GetStringFUTF16(
         IDS_OPTIONS_CLOUD_PRINT_CONNECTOR_ENABLED_LABEL,
         l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT),
-        UTF8ToUTF16(email));
+        base::UTF8ToUTF16(email));
   }
   base::StringValue label(label_str);
 
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index 1077463..67419bee 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -39,6 +39,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
+using base::UTF8ToUTF16;
 using content::BrowserThread;
 
 namespace {
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 25a449a..0898105 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -965,7 +965,7 @@ void InternetOptionsHandler::GetLocalizedValues(
 
   std::string owner;
   chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
-  localized_strings->SetString("ownerUserId", UTF8ToUTF16(owner));
+  localized_strings->SetString("ownerUserId", base::UTF8ToUTF16(owner));
 
   base::DictionaryValue* network_dictionary = new base::DictionaryValue;
   FillNetworkInfo(network_dictionary);
diff --git a/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc b/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc
index c7e6e75..d115135 100644
--- a/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc
@@ -49,7 +49,7 @@ void PointerHandler::GetLocalizedValues(
   localized_strings->SetString("naturalScroll",
       l10n_util::GetStringFUTF16(
           IDS_OPTIONS_SETTINGS_NATURAL_SCROLL_DESCRIPTION,
-          ASCIIToUTF16(chrome::kNaturalScrollHelpURL)));
+          base::ASCIIToUTF16(chrome::kNaturalScrollHelpURL)));
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
 }
diff --git a/chrome/browser/ui/webui/options/chromeos/stats_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.cc
index a5ab712..37938dd 100644
--- a/chrome/browser/ui/webui/options/chromeos/stats_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/stats_options_handler.cc
@@ -34,7 +34,7 @@ void StatsOptionsHandler::RegisterMessages() {
 void StatsOptionsHandler::HandleMetricsReportingCheckbox(
     const base::ListValue* args) {
 #if defined(GOOGLE_CHROME_BUILD)
-  const std::string checked_str = UTF16ToUTF8(ExtractStringValue(args));
+  const std::string checked_str = base::UTF16ToUTF8(ExtractStringValue(args));
   const bool enabled = (checked_str == "true");
   content::RecordAction(
       enabled ?
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index 433bf0b..340b8ec 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -593,7 +593,7 @@ void CoreOptionsHandler::HandleClearPref(const base::ListValue* args) {
 }
 
 void CoreOptionsHandler::HandleUserMetricsAction(const base::ListValue* args) {
-  std::string metric = UTF16ToUTF8(ExtractStringValue(args));
+  std::string metric = base::UTF16ToUTF8(ExtractStringValue(args));
   if (!metric.empty())
     content::RecordComputedAction(metric);
 }
diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc
index 2423055..22e64c4 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/font_settings_handler.cc
@@ -107,7 +107,7 @@ void FontSettingsHandler::GetLocalizedValues(
   localized_strings->SetString("advancedFontSettingsInstall",
       l10n_util::GetStringFUTF16(
           IDS_FONT_LANGUAGE_SETTING_ADVANCED_FONT_SETTINGS_INSTALL,
-          UTF8ToUTF16(
+          base::UTF8ToUTF16(
               install_url.Resolve(kAdvancedFontSettingsExtensionId).spec())));
 }
 
diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc
index f7fa662..bb76b44 100644
--- a/chrome/browser/ui/webui/options/handler_options_handler.cc
+++ b/chrome/browser/ui/webui/options/handler_options_handler.cc
@@ -192,8 +192,8 @@ ProtocolHandler HandlerOptionsHandler::ParseHandlerFromArgs(
     args->GetString(2, &title);
   if (!ok)
     return ProtocolHandler::EmptyProtocolHandler();
-  return ProtocolHandler::CreateProtocolHandler(UTF16ToUTF8(protocol),
-                                                GURL(UTF16ToUTF8(url)),
+  return ProtocolHandler::CreateProtocolHandler(base::UTF16ToUTF8(protocol),
+                                                GURL(base::UTF16ToUTF8(url)),
                                                 title);
 }
 
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index b6e83db..cd9ca5a 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -256,9 +256,10 @@ void ManageProfileHandler::SendProfileNames() {
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   base::DictionaryValue profile_name_dict;
-  for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i)
-    profile_name_dict.SetBoolean(UTF16ToUTF8(cache.GetNameOfProfileAtIndex(i)),
-                                 true);
+  for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i) {
+    profile_name_dict.SetBoolean(
+        base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(i)), true);
+  }
 
   web_ui()->CallJavascriptFunction("ManageProfileOverlay.receiveProfileNames",
                                    profile_name_dict);
@@ -405,7 +406,8 @@ void ManageProfileHandler::RequestCreateProfileUpdate(
   Profile* profile = Profile::FromWebUI(web_ui());
   SigninManagerBase* manager =
       SigninManagerFactory::GetForProfile(profile);
-  base::string16 username = UTF8ToUTF16(manager->GetAuthenticatedUsername());
+  base::string16 username =
+      base::UTF8ToUTF16(manager->GetAuthenticatedUsername());
   ProfileSyncService* service =
      ProfileSyncServiceFactory::GetForProfile(profile);
   GoogleServiceAuthError::State state = service->GetAuthError().state();
diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc
index a7a9a06..b3125a6 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/password_manager_handler.cc
@@ -111,7 +111,7 @@ void PasswordManagerHandler::InitializeHandler() {
 
 void PasswordManagerHandler::HandleRemoveSavedPassword(
     const base::ListValue* args) {
-  std::string string_value = UTF16ToUTF8(ExtractStringValue(args));
+  std::string string_value = base::UTF16ToUTF8(ExtractStringValue(args));
   int index;
   if (base::StringToInt(string_value, &index) && index >= 0) {
     password_manager_presenter_.RemoveSavedPassword(static_cast<size_t>(index));
@@ -120,7 +120,7 @@ void PasswordManagerHandler::HandleRemoveSavedPassword(
 
 void PasswordManagerHandler::HandleRemovePasswordException(
     const base::ListValue* args) {
-  std::string string_value = UTF16ToUTF8(ExtractStringValue(args));
+  std::string string_value = base::UTF16ToUTF8(ExtractStringValue(args));
   int index;
   if (base::StringToInt(string_value, &index) && index >= 0) {
     password_manager_presenter_.RemovePasswordException(
@@ -157,7 +157,7 @@ void PasswordManagerHandler::SetPasswordList(
     bool show_passwords) {
   base::ListValue entries;
   languages_ = GetProfile()->GetPrefs()->GetString(prefs::kAcceptLanguages);
-  base::string16 placeholder(ASCIIToUTF16("        "));
+  base::string16 placeholder(base::ASCIIToUTF16("        "));
   for (size_t i = 0; i < password_list.size(); ++i) {
     base::ListValue* entry = new base::ListValue();
     entry->Append(new base::StringValue(net::FormatUrl(password_list[i]->origin,
diff --git a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.cc b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.cc
index 3de996f..37bf912 100644
--- a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.cc
+++ b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.cc
@@ -28,7 +28,8 @@ content::WebUIDataSource* CreateWebUIHTMLSource() {
   source->AddResourcePath("flot.js", IDR_PERFORMANCE_MONITOR_JQUERY_FLOT_JS);
   source->SetDefaultResource(IDR_PERFORMANCE_MONITOR_HTML);
 
-  source->AddString("enableFlagsURL", ASCIIToUTF16(chrome::kChromeUIFlagsURL));
+  source->AddString("enableFlagsURL",
+                    base::ASCIIToUTF16(chrome::kChromeUIFlagsURL));
 
   source->AddLocalizedString("title", IDS_PERFORMANCE_MONITOR_TITLE);
   source->AddLocalizedString("flagNotEnabledWarning",
diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc
index 27807de..635ca3e 100644
--- a/chrome/browser/ui/webui/plugins_ui.cc
+++ b/chrome/browser/ui/webui/plugins_ui.cc
@@ -249,10 +249,10 @@ void PluginsDOMHandler::HandleEnablePluginMessage(const base::ListValue* args) {
     plugin_prefs->EnablePluginGroup(enable, group_name);
     if (enable) {
       // See http://crbug.com/50105 for background.
-      base::string16 adobereader = ASCIIToUTF16(
+      base::string16 adobereader = base::ASCIIToUTF16(
           PluginMetadata::kAdobeReaderGroupName);
       base::string16 internalpdf =
-          ASCIIToUTF16(ChromeContentClient::kPDFPluginName);
+          base::ASCIIToUTF16(ChromeContentClient::kPDFPluginName);
       if (group_name == adobereader)
         plugin_prefs->EnablePluginGroup(false, internalpdf);
       else if (group_name == internalpdf)
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 68b056a..e913c6b 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -833,7 +833,7 @@ void PrintPreviewHandler::PrintToPdf() {
     base::FilePath::StringType print_job_title(print_job_title_utf16);
 #elif defined(OS_POSIX)
     base::FilePath::StringType print_job_title =
-        UTF16ToUTF8(print_job_title_utf16);
+        base::UTF16ToUTF8(print_job_title_utf16);
 #endif
 
     file_util::ReplaceIllegalCharactersInPath(&print_job_title, '_');
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 44c6171..b81f940 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -209,7 +209,7 @@ content::WebUIDataSource* CreatePrintPreviewUISource() {
                              IDS_PRINT_PREVIEW_PAGE_LABEL_SINGULAR);
   source->AddLocalizedString("printPreviewPageLabelPlural",
                              IDS_PRINT_PREVIEW_PAGE_LABEL_PLURAL);
-  const base::string16 shortcut_text(UTF8ToUTF16(kAdvancedPrintShortcut));
+  const base::string16 shortcut_text(base::UTF8ToUTF16(kAdvancedPrintShortcut));
 #if defined(OS_CHROMEOS)
   source->AddString(
       "systemDialogOption",
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
index d642b0f..3bd8c6f 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
@@ -96,7 +96,7 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTest, WindowedNPAPIPluginHidden) {
                                                true);
 
   // First load the page and wait for the NPAPI plugin's window to display.
-  base::string16 expected_title(ASCIIToUTF16("ready"));
+  base::string16 expected_title(base::ASCIIToUTF16("ready"));
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   content::TitleWatcher title_watcher(tab, expected_title);
diff --git a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
index 8351137..1d58505 100644
--- a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
+++ b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc
@@ -21,6 +21,8 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::ASCIIToUTF16;
+
 // Rewrite to use WebUI testing infrastructure. Current code below is mostly
 // testing how WebUI concrete class serializes function parameters, and that
 // SyncInternalsUI::HandleJSEvent/HandleJsReply prefix the given function with
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 06614fd..f7c568d 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -215,13 +215,14 @@ void SyncSetupHandler::GetStaticLocalizedValues(
   localized_strings->SetString(
       "passphraseRecover",
       GetStringFUTF16(IDS_SYNC_PASSPHRASE_RECOVER,
-                      ASCIIToUTF16(google_util::StringAppendGoogleLocaleParam(
-                          chrome::kSyncGoogleDashboardURL))));
+                      base::ASCIIToUTF16(
+                          google_util::StringAppendGoogleLocaleParam(
+                              chrome::kSyncGoogleDashboardURL))));
   localized_strings->SetString("stopSyncingExplanation",
       l10n_util::GetStringFUTF16(
           IDS_SYNC_STOP_SYNCING_EXPLANATION_LABEL,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-          ASCIIToUTF16(google_util::StringAppendGoogleLocaleParam(
+          base::ASCIIToUTF16(google_util::StringAppendGoogleLocaleParam(
               chrome::kSyncGoogleDashboardURL))));
   localized_strings->SetString("stopSyncingTitle",
       l10n_util::GetStringUTF16(IDS_SYNC_STOP_SYNCING_DIALOG_TITLE));
diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index 297a7f4..cee64ff 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc
@@ -25,6 +25,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
+using base::ASCIIToUTF16;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::RenderViewHost;
diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc
index 20c3951..9426b72 100644
--- a/chrome/browser/ui/webui/version_ui.cc
+++ b/chrome/browser/ui/webui/version_ui.cc
@@ -97,8 +97,8 @@ content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) {
                                   IDS_ABOUT_VERSION_COMMAND_LINE);
 
 #if defined(OS_WIN)
-  html_source->AddString("command_line",
-      WideToUTF16(CommandLine::ForCurrentProcess()->GetCommandLineString()));
+  html_source->AddString("command_line", base::WideToUTF16(
+      CommandLine::ForCurrentProcess()->GetCommandLineString()));
 #elif defined(OS_POSIX)
   std::string command_line;
   typedef std::vector<std::string> ArgvList;
diff --git a/chrome/browser/ui/webui/welcome_ui_android.cc b/chrome/browser/ui/webui/welcome_ui_android.cc
index b5321a8..1894669 100644
--- a/chrome/browser/ui/webui/welcome_ui_android.cc
+++ b/chrome/browser/ui/webui/welcome_ui_android.cc
@@ -58,8 +58,8 @@ WelcomeUI::WelcomeUI(content::WebUI* web_ui)
   if (tos_visible) {
     std::string privacy_notice_url =
         base::StringPrintf(kPrivacyNoticeBaseURL, locale.c_str());
-    tos_html = l10n_util::GetStringFUTF16(IDS_FIRSTRUN_TOS_EXPLANATION,
-                                          UTF8ToUTF16(privacy_notice_url));
+    tos_html = l10n_util::GetStringFUTF16(
+        IDS_FIRSTRUN_TOS_EXPLANATION, base::UTF8ToUTF16(privacy_notice_url));
   }
   html_source->AddString("tosHtml", tos_html);
 
diff --git a/chrome/browser/undo/bookmark_undo_service_test.cc b/chrome/browser/undo/bookmark_undo_service_test.cc
index 436ce21..6bac7c2 100644
--- a/chrome/browser/undo/bookmark_undo_service_test.cc
+++ b/chrome/browser/undo/bookmark_undo_service_test.cc
@@ -13,6 +13,8 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::ASCIIToUTF16;
+
 namespace {
 
 class BookmarkUndoServiceTest : public testing::Test {
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc
index 8c3cb12..5f8526d0 100644
--- a/chrome/browser/unload_browsertest.cc
+++ b/chrome/browser/unload_browsertest.cc
@@ -133,7 +133,7 @@ class UnloadTest : public InProcessBrowserTest {
   }
 
   void CheckTitle(const char* expected_title) {
-    base::string16 expected = ASCIIToUTF16(expected_title);
+    base::string16 expected = base::ASCIIToUTF16(expected_title);
     EXPECT_EQ(expected,
               browser()->tab_strip_model()->GetActiveWebContents()->GetTitle());
   }
@@ -281,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
   // in-flight IPCs from the renderer reach the browser. Otherwise the browser
   // won't put up the beforeunload dialog because it's waiting for an ack from
   // the renderer.
-  base::string16 expected_title = ASCIIToUTF16("cancelled");
+  base::string16 expected_title = base::ASCIIToUTF16("cancelled");
   content::TitleWatcher title_watcher(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title);
   ClickModalDialogButton(false);
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 4750654..6043756 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -70,7 +70,7 @@ base::FilePath GetSanitizedFileName(const base::string16& name) {
 #if defined(OS_WIN)
   base::string16 file_name = name;
 #else
-  std::string file_name = UTF16ToUTF8(name);
+  std::string file_name = base::UTF16ToUTF8(name);
 #endif
   file_util::ReplaceIllegalCharactersInPath(&file_name, '_');
   return base::FilePath(file_name);
@@ -95,8 +95,8 @@ base::FilePath GetWebAppDataDirectory(const base::FilePath& profile_path,
   std::string scheme_port(scheme + "_" + port);
 
 #if defined(OS_WIN)
-  base::FilePath::StringType host_path(UTF8ToUTF16(host));
-  base::FilePath::StringType scheme_port_path(UTF8ToUTF16(scheme_port));
+  base::FilePath::StringType host_path(base::UTF8ToUTF16(host));
+  base::FilePath::StringType scheme_port_path(base::UTF8ToUTF16(scheme_port));
 #elif defined(OS_POSIX)
   base::FilePath::StringType host_path(host);
   base::FilePath::StringType scheme_port_path(scheme_port);
diff --git a/chrome/browser/web_applications/web_app_mac_unittest.mm b/chrome/browser/web_applications/web_app_mac_unittest.mm
index 4b2909a..4633837 100644
--- a/chrome/browser/web_applications/web_app_mac_unittest.mm
+++ b/chrome/browser/web_applications/web_app_mac_unittest.mm
@@ -55,7 +55,7 @@ ShellIntegration::ShortcutInfo GetShortcutInfo() {
   ShellIntegration::ShortcutInfo info;
   info.extension_id = "extensionid";
   info.extension_path = base::FilePath("/fake/extension/path");
-  info.title = ASCIIToUTF16("Shortcut Title");
+  info.title = base::ASCIIToUTF16("Shortcut Title");
   info.url = GURL("http://example.com/");
   info.profile_path = base::FilePath("user_data_dir").Append("Profile 1");
   info.profile_name = "profile name";
diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc
index f6f1a0f..791cfee 100644
--- a/chrome/browser/web_applications/web_app_unittest.cc
+++ b/chrome/browser/web_applications/web_app_unittest.cc
@@ -32,8 +32,8 @@ class WebApplicationTest : public ChromeRenderViewHostTestHarness {
 #define MAYBE_GetShortcutInfoForTab GetShortcutInfoForTab
 #endif
 TEST_F(WebApplicationTest, MAYBE_GetShortcutInfoForTab) {
-  const base::string16 title = ASCIIToUTF16("TEST_TITLE");
-  const base::string16 description = ASCIIToUTF16("TEST_DESCRIPTION");
+  const base::string16 title = base::ASCIIToUTF16("TEST_TITLE");
+  const base::string16 description = base::ASCIIToUTF16("TEST_DESCRIPTION");
   const GURL url("http://www.foo.com/bar");
   WebApplicationInfo web_app_info;
   web_app_info.title = title;
diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc
index a4bf6d8..dc7a7ef 100644
--- a/chrome/browser/web_applications/web_app_win.cc
+++ b/chrome/browser/web_applications/web_app_win.cc
@@ -210,7 +210,7 @@ bool CreateShortcutsInPaths(
   // Generates app id from web app url and profile path.
   std::string app_name(web_app::GenerateApplicationNameFromInfo(shortcut_info));
   base::string16 app_id(ShellIntegration::GetAppModelIdForProfile(
-      UTF8ToUTF16(app_name), shortcut_info.profile_path));
+      base::UTF8ToUTF16(app_name), shortcut_info.profile_path));
 
   bool success = true;
   for (size_t i = 0; i < shortcut_paths.size(); ++i) {
diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc
index 7dcd592..80ed3dc 100644
--- a/chrome/browser/web_resource/promo_resource_service_unittest.cc
+++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc
@@ -49,9 +49,9 @@ bool YearFromNow(double* date_epoch, std::string* date_string) {
   if (!U_SUCCESS(status))
     return false;
 
-  return UTF16ToUTF8(date_unicode_string.getBuffer(),
-                     static_cast<size_t>(date_unicode_string.length()),
-                     date_string);
+  return base::UTF16ToUTF8(date_unicode_string.getBuffer(),
+                           static_cast<size_t>(date_unicode_string.length()),
+                           date_string);
 }
 
 }  // namespace
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc
index a57994a..0ac678a 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.cc
+++ b/chrome/browser/webdata/autocomplete_syncable_service.cc
@@ -399,8 +399,8 @@ void AutocompleteSyncableService::WriteAutofillEntry(
     const AutofillEntry& entry, sync_pb::EntitySpecifics* autofill_specifics) {
   sync_pb::AutofillSpecifics* autofill =
       autofill_specifics->mutable_autofill();
-  autofill->set_name(UTF16ToUTF8(entry.key().name()));
-  autofill->set_value(UTF16ToUTF8(entry.key().value()));
+  autofill->set_name(base::UTF16ToUTF8(entry.key().name()));
+  autofill->set_value(base::UTF16ToUTF8(entry.key().value()));
   const std::vector<base::Time>& ts(entry.timestamps());
   for (std::vector<base::Time>::const_iterator timestamp = ts.begin();
        timestamp != ts.end(); ++timestamp) {
@@ -412,7 +412,8 @@ syncer::SyncError AutocompleteSyncableService::AutofillEntryDelete(
     const sync_pb::AutofillSpecifics& autofill) {
   if (!AutofillTable::FromWebDatabase(
           webdata_backend_->GetDatabase())->RemoveFormElement(
-              UTF8ToUTF16(autofill.name()), UTF8ToUTF16(autofill.value()))) {
+              base::UTF8ToUTF16(autofill.name()),
+              base::UTF8ToUTF16(autofill.value()))) {
     return error_handler_->CreateAndUploadError(
         FROM_HERE,
         "Could not remove autocomplete entry from WebDatabase.");
@@ -481,8 +482,8 @@ syncer::SyncData AutocompleteSyncableService::CreateSyncData(
     const AutofillEntry& entry) const {
   sync_pb::EntitySpecifics autofill_specifics;
   WriteAutofillEntry(entry, &autofill_specifics);
-  std::string tag(KeyToTag(UTF16ToUTF8(entry.key().name()),
-                           UTF16ToUTF8(entry.key().value())));
+  std::string tag(KeyToTag(base::UTF16ToUTF8(entry.key().name()),
+                           base::UTF16ToUTF8(entry.key().value())));
   return syncer::SyncData::CreateLocalData(tag, tag, autofill_specifics);
 }
 
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc
index af9558a..3146b89 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.cc
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc
@@ -19,6 +19,8 @@
 #include "sync/api/sync_error_factory.h"
 #include "sync/protocol/sync.pb.h"
 
+using base::ASCIIToUTF16;
+using base::UTF16ToUTF8;
 using autofill::AutofillCountry;
 using autofill::ServerFieldType;
 using autofill::AutofillProfile;
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
index 58be6e6..5bf7108 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
+++ b/chrome/browser/webdata/autofill_profile_syncable_service_unittest.cc
@@ -22,6 +22,7 @@ using ::testing::Return;
 using ::testing::Property;
 using autofill::AutofillProfile;
 using autofill::AutofillProfileChange;
+using base::UTF8ToUTF16;
 using content::BrowserThread;
 
 // Some guids for testing.
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc
index 989ced5..585c629 100644
--- a/chrome/browser/webdata/keyword_table.cc
+++ b/chrome/browser/webdata/keyword_table.cc
@@ -629,7 +629,7 @@ bool KeywordTable::MigrateKeywordsTableForVersion45(const std::string& name) {
   sql = "SELECT id, keyword, url, autogenerate_keyword FROM " + name +
       " ORDER BY id ASC";
   sql::Statement s(db_->GetUniqueStatement(sql.c_str()));
-  base::string16 placeholder_keyword(ASCIIToUTF16("dummy"));
+  base::string16 placeholder_keyword(base::ASCIIToUTF16("dummy"));
   std::set<base::string16> keywords;
   while (s.Step()) {
     base::string16 keyword(s.ColumnString16(1));
@@ -655,7 +655,7 @@ bool KeywordTable::MigrateKeywordsTableForVersion45(const std::string& name) {
         // Ensure autogenerated keywords are unique.
         keyword = TemplateURLService::GenerateKeyword(url);
         while (keywords.count(keyword))
-          keyword.append(ASCIIToUTF16("_"));
+          keyword.append(base::ASCIIToUTF16("_"));
         sql::Statement u(db_->GetUniqueStatement(
             "UPDATE keywords_temp SET keyword=? WHERE id=?"));
         u.BindString16(0, keyword);
diff --git a/chrome/browser/webdata/keyword_table_unittest.cc b/chrome/browser/webdata/keyword_table_unittest.cc
index fd38fb6..5e7a9d7 100644
--- a/chrome/browser/webdata/keyword_table_unittest.cc
+++ b/chrome/browser/webdata/keyword_table_unittest.cc
@@ -17,6 +17,7 @@
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::ASCIIToUTF16;
 using base::Time;
 using base::TimeDelta;
 
diff --git a/chrome/browser/webdata/logins_table_win.cc b/chrome/browser/webdata/logins_table_win.cc
index bfc1ec8..1ca767e 100644
--- a/chrome/browser/webdata/logins_table_win.cc
+++ b/chrome/browser/webdata/logins_table_win.cc
@@ -15,7 +15,7 @@ bool LoginsTable::AddIE7Login(const IE7PasswordInfo& info) {
       "INSERT OR REPLACE INTO ie7_logins "
       "(url_hash, password_value, date_created) "
       "VALUES (?,?,?)"));
-  s.BindString(0, WideToUTF8(info.url_hash));
+  s.BindString(0, base::WideToUTF8(info.url_hash));
   s.BindBlob(1, &info.encrypted_data.front(),
              static_cast<int>(info.encrypted_data.size()));
   s.BindInt64(2, info.date_created.ToTimeT());
@@ -27,7 +27,7 @@ bool LoginsTable::RemoveIE7Login(const IE7PasswordInfo& info) {
   // Remove a login by UNIQUE-constrained fields.
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM ie7_logins WHERE url_hash = ?"));
-  s.BindString(0, WideToUTF8(info.url_hash));
+  s.BindString(0, base::WideToUTF8(info.url_hash));
 
   return s.Run();
 }