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/120943002

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

47 files changed, 160 insertions, 149 deletions

diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
index e10877d..c4c1c66 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
@@ -39,7 +39,7 @@ void PlatformVerificationDialog::ShowDialog(
 
   PlatformVerificationDialog* dialog = new PlatformVerificationDialog(
       chrome::FindBrowserWithWebContents(web_contents),
-      UTF8ToUTF16(origin),
+      base::UTF8ToUTF16(origin),
       callback);
 
   // Sets up the dialog widget and shows it.
diff --git a/chrome/browser/chromeos/drive/file_system_util_unittest.cc b/chrome/browser/chromeos/drive/file_system_util_unittest.cc
index f78865e..2be00f3 100644
--- a/chrome/browser/chromeos/drive/file_system_util_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_util_unittest.cc
@@ -43,7 +43,7 @@ TEST(FileSystemUtilTest, FilePathToDriveURL) {
   utf16_string.push_back(0x307b);  // HIRAGANA_LETTER_HO
   utf16_string.push_back(0x3052);  // HIRAGANA_LETTER_GE
   path = GetDriveMyDriveRootPath().Append(
-      base::FilePath::FromUTF8Unsafe(UTF16ToUTF8(utf16_string) + ".txt"));
+      base::FilePath::FromUTF8Unsafe(base::UTF16ToUTF8(utf16_string) + ".txt"));
   EXPECT_EQ(path, DriveURLToFilePath(FilePathToDriveURL(path)));
 }
 
diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc
index 3aaaa8d..47d6ebd 100644
--- a/chrome/browser/chromeos/enrollment_dialog_view.cc
+++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
@@ -152,7 +152,7 @@ void EnrollmentDialogView::InitDialog() {
   // Create the views and layout manager and set them up.
   views::Label* label = new views::Label(
       l10n_util::GetStringFUTF16(IDS_NETWORK_ENROLLMENT_HANDLER_INSTRUCTIONS,
-                                 UTF8ToUTF16(network_name_)));
+                                 base::UTF8ToUTF16(network_name_)));
   label->SetFont(ui::ResourceBundle::GetSharedInstance().GetFont(
       ui::ResourceBundle::BaseFont));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
index 5e1899d..3fdb9fe 100644
--- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
+++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc
@@ -115,8 +115,8 @@ bool DeviceLocalAccountManagementPolicyProvider::UserMayLoad(
   if (error) {
     *error = l10n_util::GetStringFUTF16(
           IDS_EXTENSION_CANT_INSTALL_IN_DEVICE_LOCAL_ACCOUNT,
-          UTF8ToUTF16(extension->name()),
-          UTF8ToUTF16(extension->id()));
+          base::UTF8ToUTF16(extension->name()),
+          base::UTF8ToUTF16(extension->id()));
   }
   return false;
 }
diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc
index 505ffc3..34915ea 100644
--- a/chrome/browser/chromeos/extensions/echo_private_api.cc
+++ b/chrome/browser/chromeos/extensions/echo_private_api.cc
@@ -259,8 +259,8 @@ void EchoPrivateGetUserConsentFunction::OnRedeemOffersAllowedChecked(
   chromeos::EchoDialogView* dialog = new chromeos::EchoDialogView(this);
   if (redeem_offers_allowed_) {
     dialog->InitForEnabledEcho(
-        UTF8ToUTF16(params->consent_requester.service_name),
-        UTF8ToUTF16(params->consent_requester.origin));
+        base::UTF8ToUTF16(params->consent_requester.service_name),
+        base::UTF8ToUTF16(params->consent_requester.origin));
   } else {
     dialog->InitForDisabledEcho();
   }
diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc
index 30f10f2..5cc0362 100644
--- a/chrome/browser/chromeos/external_protocol_dialog.cc
+++ b/chrome/browser/chromeos/external_protocol_dialog.cc
@@ -95,13 +95,13 @@ ExternalProtocolDialog::ExternalProtocolDialog(WebContents* web_contents,
       scheme_(url.scheme()) {
   const int kMaxUrlWithoutSchemeSize = 256;
   base::string16 elided_url_without_scheme;
-  gfx::ElideString(ASCIIToUTF16(url.possibly_invalid_spec()),
+  gfx::ElideString(base::ASCIIToUTF16(url.possibly_invalid_spec()),
       kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
 
   views::MessageBoxView::InitParams params(
       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"));
   params.message_width = kMessageWidth;
   message_box_view_ = new views::MessageBoxView(params);
   message_box_view_->SetCheckBoxLabel(
diff --git a/chrome/browser/chromeos/file_manager/desktop_notifications.cc b/chrome/browser/chromeos/file_manager/desktop_notifications.cc
index 4675bdd..ef3e761 100644
--- a/chrome/browser/chromeos/file_manager/desktop_notifications.cc
+++ b/chrome/browser/chromeos/file_manager/desktop_notifications.cc
@@ -168,7 +168,7 @@ class DesktopNotifications::NotificationMessage {
         ResourceBundle::GetSharedInstance().GetNativeImageNamed(
             GetIconId(type));
     // TODO(mukai): refactor here to invoke NotificationUIManager directly.
-    const base::string16 replace_id = UTF8ToUTF16(notification_id);
+    const base::string16 replace_id = base::UTF8ToUTF16(notification_id);
     DesktopNotificationService::AddIconNotification(
         util::GetFileManagerBaseUrl(), GetTitle(type),
         message, icon, replace_id,
@@ -257,19 +257,19 @@ void DesktopNotifications::ManageNotificationsOnMountCompleted(
         l10n_util::GetStringUTF16(
             IDS_MULTIPART_DEVICE_UNSUPPORTED_DEFAULT_MESSAGE) :
         l10n_util::GetStringFUTF16(
-            IDS_MULTIPART_DEVICE_UNSUPPORTED_MESSAGE, UTF8ToUTF16(label));
+            IDS_MULTIPART_DEVICE_UNSUPPORTED_MESSAGE, base::UTF8ToUTF16(label));
   } else if (!success) {
     // First device failed.
     if (!is_unsupported) {
       message = label.empty() ?
           l10n_util::GetStringUTF16(IDS_DEVICE_UNKNOWN_DEFAULT_MESSAGE) :
           l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE,
-                                     UTF8ToUTF16(label));
+                                     base::UTF8ToUTF16(label));
     } else {
       message = label.empty() ?
           l10n_util::GetStringUTF16(IDS_DEVICE_UNSUPPORTED_DEFAULT_MESSAGE) :
           l10n_util::GetStringFUTF16(IDS_DEVICE_UNSUPPORTED_MESSAGE,
-                                     UTF8ToUTF16(label));
+                                     base::UTF8ToUTF16(label));
     }
   }
 
diff --git a/chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc b/chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc
index 7548d10..577c984 100644
--- a/chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/desktop_notifications_unittest.cc
@@ -174,7 +174,7 @@ TEST(FileManagerMountNotificationsTest, UnsupportedDevice) {
   EXPECT_EQ(notification_path, notifications.params()[1].path);
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(IDS_DEVICE_UNSUPPORTED_MESSAGE,
-                                 UTF8ToUTF16(device_label)),
+                                 base::UTF8ToUTF16(device_label)),
       notifications.params()[1].message);
 }
 
@@ -226,7 +226,7 @@ TEST(FileManagerMountNotificationsTest, UnsupportedWithUnknownParent) {
   EXPECT_EQ(notification_path, notifications.params()[3].path);
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(IDS_DEVICE_UNSUPPORTED_MESSAGE,
-                                 UTF8ToUTF16(device_label)),
+                                 base::UTF8ToUTF16(device_label)),
       notifications.params()[3].message);
 }
 
@@ -266,7 +266,7 @@ TEST(FileManagerMountNotificationsTest, MountPartialSuccess) {
   EXPECT_EQ(notification_path, notifications.params()[1].path);
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(IDS_MULTIPART_DEVICE_UNSUPPORTED_MESSAGE,
-                                 UTF8ToUTF16(device_label)),
+                                 base::UTF8ToUTF16(device_label)),
       notifications.params()[1].message);
 }
 
@@ -298,7 +298,7 @@ TEST(FileManagerMountNotificationsTest, Unknown) {
   EXPECT_EQ(notification_path, notifications.params()[1].path);
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE,
-                                 UTF8ToUTF16(device_label)),
+                                 base::UTF8ToUTF16(device_label)),
       notifications.params()[1].message);
 }
 
@@ -331,7 +331,7 @@ TEST(FileManagerMountNotificationsTest, NonASCIILabel) {
   EXPECT_EQ(notification_path, notifications.params()[1].path);
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE,
-                                 UTF8ToUTF16(device_label)),
+                                 base::UTF8ToUTF16(device_label)),
       notifications.params()[1].message);
 }
 
@@ -363,7 +363,7 @@ TEST(FileManagerMountNotificationsTest, MulitpleFail) {
   EXPECT_EQ(notification_path, notifications.params()[1].path);
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE,
-                                 UTF8ToUTF16(device_label)),
+                                 base::UTF8ToUTF16(device_label)),
       notifications.params()[1].message);
 
   notifications.ManageNotificationsOnMountCompleted(
@@ -386,7 +386,7 @@ TEST(FileManagerMountNotificationsTest, MulitpleFail) {
   EXPECT_EQ(notification_path, notifications.params()[3].path);
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(IDS_DEVICE_UNKNOWN_MESSAGE,
-                                 UTF8ToUTF16(device_label)),
+                                 base::UTF8ToUTF16(device_label)),
       notifications.params()[3].message);
 
   notifications.ManageNotificationsOnMountCompleted(
@@ -409,7 +409,7 @@ TEST(FileManagerMountNotificationsTest, MulitpleFail) {
   EXPECT_EQ(notification_path, notifications.params()[5].path);
   EXPECT_EQ(
       l10n_util::GetStringFUTF16(IDS_MULTIPART_DEVICE_UNSUPPORTED_MESSAGE,
-                                 UTF8ToUTF16(device_label)),
+                                 base::UTF8ToUTF16(device_label)),
       notifications.params()[5].message);
 
   notifications.ManageNotificationsOnMountCompleted(
diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
index 1ab6d56..8877a1c 100644
--- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
+++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
@@ -80,10 +80,10 @@ const FileBrowserHandler* FindFileBrowserHandlerForActionId(
 }
 
 std::string EscapedUtf8ToLower(const std::string& str) {
-  base::string16 utf16 = UTF8ToUTF16(
+  base::string16 utf16 = base::UTF8ToUTF16(
       net::UnescapeURLComponent(str, net::UnescapeRule::NORMAL));
   return net::EscapeUrlEncodedData(
-      UTF16ToUTF8(base::i18n::ToLower(utf16)),
+      base::UTF16ToUTF8(base::i18n::ToLower(utf16)),
       false /* do not replace space with plus */);
 }
 
diff --git a/chrome/browser/chromeos/file_manager/open_util.cc b/chrome/browser/chromeos/file_manager/open_util.cc
index 825f56a..86952cb 100644
--- a/chrome/browser/chromeos/file_manager/open_util.cc
+++ b/chrome/browser/chromeos/file_manager/open_util.cc
@@ -58,7 +58,7 @@ void ShowWarningMessageBox(Profile* profile, const base::FilePath& file_path) {
       browser ? browser->window()->GetNativeWindow() : NULL,
       l10n_util::GetStringFUTF16(
           IDS_FILE_BROWSER_ERROR_VIEWING_FILE_TITLE,
-          UTF8ToUTF16(file_path.BaseName().value())),
+          base::UTF8ToUTF16(file_path.BaseName().value())),
       l10n_util::GetStringUTF16(IDS_FILE_BROWSER_ERROR_VIEWING_FILE),
       chrome::MESSAGE_BOX_TYPE_WARNING);
 }
diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
index 766c6e6..2a55681 100644
--- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
+++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc
@@ -291,7 +291,7 @@ bool DriveWebContentsManager::ShouldCreateWebContents(
 
   // Prevent redirection if background contents already exists.
   if (background_contents_service->GetAppBackgroundContents(
-      UTF8ToUTF16(app_id_))) {
+      base::UTF8ToUTF16(app_id_))) {
     return false;
   }
   BackgroundContents* contents = background_contents_service
@@ -299,7 +299,7 @@ bool DriveWebContentsManager::ShouldCreateWebContents(
                                  route_id,
                                  profile_,
                                  frame_name,
-                                 ASCIIToUTF16(app_id_),
+                                 base::ASCIIToUTF16(app_id_),
                                  partition_id,
                                  session_storage_namespace);
 
@@ -318,7 +318,7 @@ void DriveWebContentsManager::Observe(
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_BACKGROUND_CONTENTS_OPENED) {
-    const std::string app_id = UTF16ToUTF8(
+    const std::string app_id = base::UTF16ToUTF8(
         content::Details<BackgroundContentsOpenedDetails>(details)
             ->application_id);
     if (app_id == app_id_)
@@ -370,7 +370,7 @@ void DriveFirstRunController::EnableOfflineMode() {
   BackgroundContentsService* background_contents_service =
       BackgroundContentsServiceFactory::GetForProfile(profile_);
   if (background_contents_service->GetAppBackgroundContents(
-      UTF8ToUTF16(drive_hosted_app_id_))) {
+      base::UTF8ToUTF16(drive_hosted_app_id_))) {
     LOG(WARNING) << "Background page for Drive app already exists";
     OnOfflineInit(false, OUTCOME_BACKGROUND_PAGE_EXISTS);
     return;
diff --git a/chrome/browser/chromeos/input_method/accessibility.cc b/chrome/browser/chromeos/input_method/accessibility.cc
index 0dac232..5047d12 100644
--- a/chrome/browser/chromeos/input_method/accessibility.cc
+++ b/chrome/browser/chromeos/input_method/accessibility.cc
@@ -45,7 +45,7 @@ void Accessibility::InputMethodChanged(InputMethodManager* imm,
 
   // Get the medium name of the changed input method (e.g. US, INTL, etc.)
   const InputMethodDescriptor descriptor = imm_->GetCurrentInputMethod();
-  const std::string medium_name = UTF16ToUTF8(
+  const std::string medium_name = base::UTF16ToUTF8(
       imm_->GetInputMethodUtil()->GetInputMethodMediumName(descriptor));
 
   AccessibilityAlertInfo event(ProfileManager::GetActiveUserProfile(),
diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
index 131fd50..41e2710 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
@@ -141,8 +141,8 @@ void CandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
     if (ibus_entry.description_title.empty() &&
         ibus_entry.description_body.empty())
       continue;
-    InfolistEntry entry(UTF8ToUTF16(ibus_entry.description_title),
-                        UTF8ToUTF16(ibus_entry.description_body));
+    InfolistEntry entry(base::UTF8ToUTF16(ibus_entry.description_title),
+                        base::UTF8ToUTF16(ibus_entry.description_body));
     if (i == cursor_index_in_page) {
       entry.highlighted = true;
       *has_highlighted = true;
diff --git a/chrome/browser/chromeos/input_method/candidate_window_view.cc b/chrome/browser/chromeos/input_method/candidate_window_view.cc
index f2423f7..7efcdd5 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_view.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window_view.cc
@@ -75,12 +75,12 @@ views::View* WrapWithPadding(views::View* view, const gfx::Insets& insets) {
 base::string16 CreateShortcutText(size_t index,
                             const CandidateWindow& candidate_window) {
   if (index >= candidate_window.candidates().size())
-    return UTF8ToUTF16("");
+    return base::string16();
   std::string shortcut_text = candidate_window.candidates()[index].label;
   if (!shortcut_text.empty() &&
       candidate_window.orientation() != CandidateWindow::VERTICAL)
     shortcut_text += '.';
-  return UTF8ToUTF16(shortcut_text);
+  return base::UTF8ToUTF16(shortcut_text);
 }
 
 // Creates the shortcut label, and returns it (never returns NULL).
@@ -245,7 +245,7 @@ gfx::Size ComputeCandidateColumnSize(
     const size_t index = start_from + i;
 
     candidate_label->SetText(
-        UTF8ToUTF16(candidate_window.candidates()[index].value));
+        base::UTF8ToUTF16(candidate_window.candidates()[index].value));
     gfx::Size text_size = candidate_label->GetPreferredSize();
     candidate_column_width = std::max(candidate_column_width,
                                       text_size.width());
@@ -279,7 +279,7 @@ gfx::Size ComputeAnnotationColumnSize(
     const size_t index = start_from + i;
 
     annotation_label->SetText(
-        UTF8ToUTF16(candidate_window.candidates()[index].annotation));
+        base::UTF8ToUTF16(candidate_window.candidates()[index].annotation));
     gfx::Size text_size = annotation_label->GetPreferredSize();
     annotation_column_width = std::max(annotation_column_width,
                                        text_size.width());
@@ -318,7 +318,7 @@ class InformationTextArea : public HidableArea {
 
   // Set the displayed text.
   void SetText(const std::string& utf8_text) {
-    label_->SetText(UTF8ToUTF16(utf8_text));
+    label_->SetText(base::UTF8ToUTF16(utf8_text));
   }
 
  protected:
@@ -745,8 +745,8 @@ void CandidateWindowView::UpdateCandidates(
        if (candidate_index < new_candidate_window.candidates().size()) {
          const CandidateWindow::Entry& entry =
              new_candidate_window.candidates()[candidate_index];
-         candidate_view->SetCandidateText(UTF8ToUTF16(entry.value));
-         candidate_view->SetAnnotationText(UTF8ToUTF16(entry.annotation));
+         candidate_view->SetCandidateText(base::UTF8ToUTF16(entry.value));
+         candidate_view->SetAnnotationText(base::UTF8ToUTF16(entry.annotation));
          candidate_view->SetRowEnabled(true);
          candidate_view->SetInfolistIcon(!entry.description_title.empty());
       } else {
diff --git a/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc b/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc
index 7702d1f..19b5a5a 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc
@@ -68,9 +68,9 @@ class CandidateWindowViewTest : public views::ViewsTestBase {
                     const std::string& candidate,
                     const std::string& annotation,
                     const CandidateView* row) {
-    EXPECT_EQ(shortcut, UTF16ToUTF8(row->shortcut_label_->text()));
-    EXPECT_EQ(candidate, UTF16ToUTF8(row->candidate_label_->text()));
-    EXPECT_EQ(annotation, UTF16ToUTF8(row->annotation_label_->text()));
+    EXPECT_EQ(shortcut, base::UTF16ToUTF8(row->shortcut_label_->text()));
+    EXPECT_EQ(candidate, base::UTF16ToUTF8(row->candidate_label_->text()));
+    EXPECT_EQ(annotation, base::UTF16ToUTF8(row->annotation_label_->text()));
   }
 };
 
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index 8bc71ac..2e62d5d 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -337,7 +337,7 @@ base::string16 InputMethodUtil::TranslateString(
   if (TranslateStringInternal(english_string, &localized_string)) {
     return localized_string;
   }
-  return UTF8ToUTF16(english_string);
+  return base::UTF8ToUTF16(english_string);
 }
 
 bool InputMethodUtil::IsValidInputMethodId(
@@ -380,7 +380,7 @@ std::string InputMethodUtil::GetInputMethodDisplayNameFromId(
   base::string16 display_name;
   if (!extension_ime_util::IsExtensionIME(input_method_id) &&
       TranslateStringInternal(input_method_id, &display_name)) {
-    return UTF16ToUTF8(display_name);
+    return base::UTF16ToUTF8(display_name);
   }
   // Return an empty string if the display name is not found.
   return "";
@@ -395,7 +395,7 @@ base::string16 InputMethodUtil::GetInputMethodShortName(
   // Check special cases first.
   for (size_t i = 0; i < kMappingFromIdToIndicatorTextLen; ++i) {
     if (kMappingFromIdToIndicatorText[i].input_method_id == input_method.id()) {
-      text = UTF8ToUTF16(kMappingFromIdToIndicatorText[i].indicator_text);
+      text = base::UTF8ToUTF16(kMappingFromIdToIndicatorText[i].indicator_text);
       break;
     }
   }
@@ -405,7 +405,7 @@ base::string16 InputMethodUtil::GetInputMethodShortName(
       IsKeyboardLayout(input_method.id())) {
     const size_t kMaxKeyboardLayoutNameLen = 2;
     const base::string16 keyboard_layout =
-        UTF8ToUTF16(GetKeyboardLayoutName(input_method.id()));
+        base::UTF8ToUTF16(GetKeyboardLayoutName(input_method.id()));
     text = StringToUpperASCII(keyboard_layout).substr(
         0, kMaxKeyboardLayoutNameLen);
   }
@@ -420,7 +420,7 @@ base::string16 InputMethodUtil::GetInputMethodShortName(
     const size_t kMaxLanguageNameLen = 2;
     DCHECK(!input_method.language_codes().empty());
     const std::string language_code = input_method.language_codes().at(0);
-    text = StringToUpperASCII(UTF8ToUTF16(language_code)).substr(
+    text = StringToUpperASCII(base::UTF8ToUTF16(language_code)).substr(
         0, kMaxLanguageNameLen);
   }
   DCHECK(!text.empty());
@@ -446,7 +446,7 @@ base::string16 InputMethodUtil::GetInputMethodLongName(
     const InputMethodDescriptor& input_method) const {
   if (!input_method.name().empty()) {
     // If the descriptor has a name, use it.
-    return UTF8ToUTF16(input_method.name());
+    return base::UTF8ToUTF16(input_method.name());
   }
 
   // We don't show language here.  Name of keyboard layout or input method
@@ -470,7 +470,7 @@ base::string16 InputMethodUtil::GetInputMethodLongName(
     const base::string16 language_name = delegate_->GetDisplayLanguageName(
         language_code);
 
-    text = language_name + UTF8ToUTF16(" - ") + text;
+    text = language_name + base::UTF8ToUTF16(" - ") + text;
   }
 
   DCHECK(!text.empty());
diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
index 9cb861b..2c1cc1d 100644
--- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc
@@ -16,6 +16,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using base::ASCIIToUTF16;
+
 namespace chromeos {
 
 extern const char* kExtensionImePrefix;
@@ -120,7 +122,7 @@ TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
   }
   {
     InputMethodDescriptor desc = GetDesc("mozc-hangul", "us", "ko");
-    EXPECT_EQ(UTF8ToUTF16("\xed\x95\x9c"),
+    EXPECT_EQ(base::UTF8ToUTF16("\xed\x95\x9c"),
               util_.GetInputMethodShortName(desc));
   }
   {
@@ -157,12 +159,12 @@ TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
   }
   {
     InputMethodDescriptor desc = GetDesc(pinyin_ime_id, "us", "zh-CN");
-    EXPECT_EQ(UTF8ToUTF16("\xe6\x8b\xbc"),
+    EXPECT_EQ(base::UTF8ToUTF16("\xe6\x8b\xbc"),
               util_.GetInputMethodShortName(desc));
   }
   {
     InputMethodDescriptor desc = GetDesc(zhuyin_ime_id, "us", "zh-TW");
-    EXPECT_EQ(UTF8ToUTF16("\xE6\xB3\xA8"),
+    EXPECT_EQ(base::UTF8ToUTF16("\xE6\xB3\xA8"),
               util_.GetInputMethodShortName(desc));
   }
 }
@@ -478,7 +480,7 @@ TEST_F(InputMethodUtilTest, TestIBusInputMethodText) {
     EXPECT_FALSE(display_name.empty())
         << "Invalid language code " << language_code;
     // On error, GetDisplayNameForLocale() returns the |language_code| as-is.
-    EXPECT_NE(language_code, UTF16ToUTF8(display_name))
+    EXPECT_NE(language_code, base::UTF16ToUTF8(display_name))
         << "Invalid language code " << language_code;
   }
 }
diff --git a/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc b/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc
index a56dc60..d8ac3f0 100644
--- a/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc
+++ b/chrome/browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc
@@ -34,8 +34,8 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest,
   helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType());
 
-  const base::string16 sample_text1 = UTF8ToUTF16("abcde");
-  const base::string16 sample_text2 = UTF8ToUTF16("fghij");
+  const base::string16 sample_text1 = base::UTF8ToUTF16("abcde");
+  const base::string16 sample_text2 = base::UTF8ToUTF16("fghij");
   const base::string16 surrounding_text2 = sample_text1 + sample_text2;
   gfx::Range expected_range1(5, 5);
   gfx::Range expected_range2(10, 10);
@@ -71,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest,
   helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType());
 
-  const base::string16 sample_text = UTF8ToUTF16("abcde");
+  const base::string16 sample_text = base::UTF8ToUTF16("abcde");
   gfx::Range expected_range(5, 5);
 
   ui::CompositionText composition_text;
@@ -109,13 +109,13 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest,
   helper.ClickElement("empty_textarea", tab);
   helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType());
-  helper.WaitForSurroundingTextChanged(UTF8ToUTF16(""), zero_range);
+  helper.WaitForSurroundingTextChanged(base::string16(), zero_range);
   EXPECT_TRUE(helper.GetSurroundingText().empty());
   EXPECT_EQ(zero_range, helper.GetSelectionRange());
 
   // Click textarea containing text, so expecting new surrounding text comes.
   helper.ClickElement("filled_textarea", tab);
-  const base::string16 expected_text = UTF8ToUTF16("abcde");
+  const base::string16 expected_text = base::UTF8ToUTF16("abcde");
   const gfx::Range expected_range(5, 5);
   helper.WaitForSurroundingTextChanged(expected_text, expected_range);
   EXPECT_EQ(expected_text, helper.GetSurroundingText());
@@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(TextInput_SurroundingTextChangedTest,
   helper.ClickElement("empty_textarea", tab);
   helper.WaitForTextInputStateChanged(ui::TEXT_INPUT_TYPE_TEXT_AREA);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT_AREA, helper.GetTextInputType());
-  helper.WaitForSurroundingTextChanged(UTF8ToUTF16(""), zero_range);
+  helper.WaitForSurroundingTextChanged(base::string16(), zero_range);
   EXPECT_TRUE(helper.GetSurroundingText().empty());
   EXPECT_EQ(zero_range, helper.GetSelectionRange());
 }
diff --git a/chrome/browser/chromeos/login/captive_portal_view.cc b/chrome/browser/chromeos/login/captive_portal_view.cc
index e909ab6..7b3c709 100644
--- a/chrome/browser/chromeos/login/captive_portal_view.cc
+++ b/chrome/browser/chromeos/login/captive_portal_view.cc
@@ -55,7 +55,7 @@ base::string16 CaptivePortalView::GetWindowTitle() const {
   std::string default_network_name =
       default_network ? default_network->name() : std::string();
   if (!default_network_name.empty()) {
-    network_name = ASCIIToUTF16(default_network_name);
+    network_name = base::ASCIIToUTF16(default_network_name);
   } else {
     DLOG(ERROR)
         << "No active/default network, but captive portal window is shown.";
diff --git a/chrome/browser/chromeos/login/eula_browsertest.cc b/chrome/browser/chromeos/login/eula_browsertest.cc
index d75083c..eed79c3 100644
--- a/chrome/browser/chromeos/login/eula_browsertest.cc
+++ b/chrome/browser/chromeos/login/eula_browsertest.cc
@@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(TermsOfServiceProcessBrowserTest, LoadOnline) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_EQ(1, ui_test_utils::FindInPage(web_contents,
-                                         ASCIIToUTF16(kFakeOnlineEULA),
+                                         base::ASCIIToUTF16(kFakeOnlineEULA),
                                          true,
                                          true,
                                          NULL,
@@ -91,12 +91,13 @@ IN_PROC_BROWSER_TEST_F(TermsOfServiceProcessBrowserTest, LoadOffline) {
       browser()->tab_strip_model()->GetActiveWebContents();
 
 #if defined(GOOGLE_CHROME_BUILD)
-  EXPECT_NE(0, ui_test_utils::FindInPage(web_contents,
-                                         ASCIIToUTF16(kOfflineEULAWarning),
-                                         true,
-                                         true,
-                                         NULL,
-                                         NULL));
+  EXPECT_NE(0,
+            ui_test_utils::FindInPage(web_contents,
+                                      base::ASCIIToUTF16(kOfflineEULAWarning),
+                                      true,
+                                      true,
+                                      NULL,
+                                      NULL));
 #else
   std::string body;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index dd3b84c..82662c07 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -52,14 +52,14 @@ base::string16 NetworkStateHelper::GetCurrentNetworkName() const {
   if (network) {
     if (network->Matches(NetworkTypePattern::Ethernet()))
       return l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
-    return UTF8ToUTF16(network->name());
+    return base::UTF8ToUTF16(network->name());
   }
 
   network = nsh->ConnectingNetworkByType(NetworkTypePattern::NonVirtual());
   if (network) {
     if (network->Matches(NetworkTypePattern::Ethernet()))
       return l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
-    return UTF8ToUTF16(network->name());
+    return base::UTF8ToUTF16(network->name());
   }
   return base::string16();
 }
diff --git a/chrome/browser/chromeos/login/language_list.cc b/chrome/browser/chromeos/login/language_list.cc
index cffa393..f6bf251 100644
--- a/chrome/browser/chromeos/login/language_list.cc
+++ b/chrome/browser/chromeos/login/language_list.cc
@@ -47,14 +47,14 @@ base::string16 LanguageList::GetLanguageNameAt(int index) const {
   // and native_name without going back to translators.
   std::string formatted_item;
   base::SStringPrintf(&formatted_item, "%s - %s",
-                      UTF16ToUTF8(locale_name).c_str(),
-                      UTF16ToUTF8(native_name).c_str());
+                      base::UTF16ToUTF8(locale_name).c_str(),
+                      base::UTF16ToUTF8(native_name).c_str());
   if (base::i18n::IsRTL())
     // Somehow combo box (even with LAYOUTRTL flag) doesn't get this
     // right so we add RTL BDO (U+202E) to set the direction
     // explicitly.
     formatted_item.insert(0, "\xE2\x80\xAE");  // U+202E = UTF-8 0xE280AE
-  return UTF8ToUTF16(formatted_item);
+  return base::UTF8ToUTF16(formatted_item);
 }
 
 std::string LanguageList::GetLocaleFromIndex(int index) const {
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc
index dabfb28..6b10023 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc
@@ -197,7 +197,7 @@ void ShowLoginWizardFinish(
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
-        UTF8ToUTF16(timezone_name));
+        base::UTF8ToUTF16(timezone_name));
   }
 }
 
diff --git a/chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc b/chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc
index 0a0c27c..bd1b35e 100644
--- a/chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc
+++ b/chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc
@@ -222,7 +222,7 @@ void SupervisedUserTest::CreateSupervisedUser() {
 
   EXPECT_TRUE(registration_utility_stub_->register_was_called());
   EXPECT_EQ(registration_utility_stub_->display_name(),
-            UTF8ToUTF16(kSupervisedUserDisplayName));
+            base::UTF8ToUTF16(kSupervisedUserDisplayName));
 
   registration_utility_stub_->RunSuccessCallback("token");
 
@@ -240,7 +240,8 @@ void SupervisedUserTest::SigninAsSupervisedUser() {
   ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size());
   // Created supervised user have to be first in a list.
   const User* user = UserManager::Get()->GetUsers().at(0);
-  ASSERT_EQ(UTF8ToUTF16(kSupervisedUserDisplayName), user->display_name());
+  ASSERT_EQ(base::UTF8ToUTF16(kSupervisedUserDisplayName),
+            user->display_name());
   LoginUser(user->email());
 }
 
@@ -250,7 +251,8 @@ void SupervisedUserTest::RemoveSupervisedUser() {
   ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size());
   // Created supervised user have to be first in a list.
   const User* user = UserManager::Get()->GetUsers().at(0);
-  ASSERT_EQ(UTF8ToUTF16(kSupervisedUserDisplayName), user->display_name());
+  ASSERT_EQ(base::UTF8ToUTF16(kSupervisedUserDisplayName),
+            user->display_name());
 
   // Open pod menu.
   JSExpect("!$('pod-row').pods[0].isActionBoxMenuActive");
@@ -366,7 +368,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
 
   EXPECT_TRUE(registration_utility_stub_->register_was_called());
   EXPECT_EQ(registration_utility_stub_->display_name(),
-            UTF8ToUTF16(kSupervisedUserDisplayName));
+            base::UTF8ToUTF16(kSupervisedUserDisplayName));
 
   std::string user_id = registration_utility_stub_->managed_user_id();
   // Make sure user is already in list.
diff --git a/chrome/browser/chromeos/login/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/proxy_settings_dialog.cc
index 2da776b..6fc9521 100644
--- a/chrome/browser/chromeos/login/proxy_settings_dialog.cc
+++ b/chrome/browser/chromeos/login/proxy_settings_dialog.cc
@@ -77,7 +77,7 @@ ProxySettingsDialog::ProxySettingsDialog(const NetworkState& network,
   }
 
   SetDialogTitle(l10n_util::GetStringFUTF16(IDS_PROXY_PAGE_TITLE_FORMAT,
-                                            ASCIIToUTF16(network_name)));
+                                            base::ASCIIToUTF16(network_name)));
 }
 
 ProxySettingsDialog::~ProxySettingsDialog() {
diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc
index 9fbf003..4372f7f 100644
--- a/chrome/browser/chromeos/login/screen_locker_tester.cc
+++ b/chrome/browser/chromeos/login/screen_locker_tester.cc
@@ -121,7 +121,7 @@ class WebUIScreenLockerTester : public ScreenLockerTester {
 void WebUIScreenLockerTester::SetPassword(const std::string& password) {
   RenderViewHost()->ExecuteJavascriptInWebFrame(
       base::string16(),
-      ASCIIToUTF16(base::StringPrintf(
+      base::ASCIIToUTF16(base::StringPrintf(
           "$('pod-row').pods[0].passwordElement.value = '%s';",
           password.c_str())));
 }
diff --git a/chrome/browser/chromeos/login/supervised_user_manager_impl.cc b/chrome/browser/chromeos/login/supervised_user_manager_impl.cc
index d335b8a..15132ea 100644
--- a/chrome/browser/chromeos/login/supervised_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/supervised_user_manager_impl.cc
@@ -189,7 +189,7 @@ base::string16 SupervisedUserManagerImpl::GetManagerDisplayName(
   if (manager_names->GetStringWithoutPathExpansion(user_id, &result) &&
       !result.empty())
     return result;
-  return UTF8ToUTF16(GetManagerDisplayEmail(user_id));
+  return base::UTF8ToUTF16(GetManagerDisplayEmail(user_id));
 }
 
 std::string SupervisedUserManagerImpl::GetManagerUserId(
diff --git a/chrome/browser/chromeos/login/user.cc b/chrome/browser/chromeos/login/user.cc
index df4d51c..c2df4bc 100644
--- a/chrome/browser/chromeos/login/user.cc
+++ b/chrome/browser/chromeos/login/user.cc
@@ -157,7 +157,7 @@ bool UserContext::operator==(const UserContext& context) const {
 base::string16 User::GetDisplayName() const {
   // Fallback to the email account name in case display name haven't been set.
   return display_name_.empty() ?
-      UTF8ToUTF16(GetAccountName(true)) :
+      base::UTF8ToUTF16(GetAccountName(true)) :
       display_name_;
 }
 
@@ -312,7 +312,7 @@ bool LocallyManagedUser::can_lock() const {
 }
 
 std::string LocallyManagedUser::display_email() const {
-  return UTF16ToUTF8(display_name());
+  return base::UTF16ToUTF8(display_name());
 }
 
 RetailModeUser::RetailModeUser() : User(UserManager::kRetailModeUserName) {
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 9264644..5c40771 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -1247,7 +1247,7 @@ void UserManagerImpl::RegularUserLoggedIn(const std::string& user_id) {
     active_user_ = User::CreateRegularUser(user_id);
     active_user_->set_oauth_token_status(LoadUserOAuthStatus(user_id));
     SaveUserDisplayName(active_user_->email(),
-                        UTF8ToUTF16(active_user_->GetAccountName(true)));
+                        base::UTF8ToUTF16(active_user_->GetAccountName(true)));
     WallpaperManager::Get()->SetInitialUserWallpaper(user_id, true);
   }
 
@@ -1585,7 +1585,7 @@ void UserManagerImpl::UpdatePublicAccountDisplayName(
   }
 
   // Set or clear the display name.
-  SaveUserDisplayName(user_id, UTF8ToUTF16(display_name));
+  SaveUserDisplayName(user_id, base::UTF8ToUTF16(display_name));
 }
 
 UserFlow* UserManagerImpl::GetCurrentUserFlow() const {
diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc
index 8461503..fbdd31c 100644
--- a/chrome/browser/chromeos/login/version_info_updater.cc
+++ b/chrome/browser/chromeos/login/version_info_updater.cc
@@ -96,8 +96,8 @@ void VersionInfoUpdater::UpdateVersionLabel() {
   std::string label_text = l10n_util::GetStringFUTF8(
       IDS_LOGIN_VERSION_LABEL_FORMAT,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-      UTF8ToUTF16(version_info.Version()),
-      UTF8ToUTF16(version_text_));
+      base::UTF8ToUTF16(version_info.Version()),
+      base::UTF8ToUTF16(version_text_));
 
   // Workaround over incorrect width calculation in old fonts.
   // TODO(glotov): remove the following line when new fonts are used.
@@ -118,7 +118,7 @@ void VersionInfoUpdater::SetEnterpriseInfo(const std::string& domain_name) {
     std::string enterprise_info;
     enterprise_info = l10n_util::GetStringFUTF8(
         IDS_DEVICE_OWNED_BY_NOTICE,
-        UTF8ToUTF16(domain_name));
+        base::UTF8ToUTF16(domain_name));
     delegate_->OnEnterpriseInfoUpdated(enterprise_info);
   }
 }
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 49a93a9..95d87eb 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -409,7 +409,7 @@ void WebUILoginView::DidFailProvisionalLoad(
     int error_code,
     const base::string16& error_description,
     content::RenderViewHost* render_view_host) {
-  if (frame_unique_name != UTF8ToUTF16("gaia-frame"))
+  if (frame_unique_name != base::UTF8ToUTF16("gaia-frame"))
     return;
 
   base::FundamentalValue error_value(-error_code);
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 6df0520..90a1e8c 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -166,14 +166,14 @@ IN_PROC_BROWSER_TEST_F(WizardControllerTest, SwitchLanguage) {
   EXPECT_STREQ("en", icu::Locale::getDefault().getLanguage());
   EXPECT_FALSE(base::i18n::IsRTL());
   const std::wstring en_str =
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
+      base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
 
   RunSwitchLanguageTest("fr", "fr", true);
   EXPECT_EQ("fr", g_browser_process->GetApplicationLocale());
   EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage());
   EXPECT_FALSE(base::i18n::IsRTL());
   const std::wstring fr_str =
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
+      base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
 
   EXPECT_NE(en_str, fr_str);
 
@@ -182,7 +182,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerTest, SwitchLanguage) {
   EXPECT_STREQ("ar", icu::Locale::getDefault().getLanguage());
   EXPECT_TRUE(base::i18n::IsRTL());
   const std::wstring ar_str =
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
+      base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
 
   EXPECT_NE(fr_str, ar_str);
 }
diff --git a/chrome/browser/chromeos/memory/oom_priority_manager.cc b/chrome/browser/chromeos/memory/oom_priority_manager.cc
index c8d9538..b19715f 100644
--- a/chrome/browser/chromeos/memory/oom_priority_manager.cc
+++ b/chrome/browser/chromeos/memory/oom_priority_manager.cc
@@ -227,13 +227,13 @@ std::vector<base::string16> OomPriorityManager::GetTabTitles() {
     str.reserve(4096);
     int score = pid_to_oom_score_[it->renderer_handle];
     str += base::IntToString16(score);
-    str += ASCIIToUTF16(" - ");
+    str += base::ASCIIToUTF16(" - ");
     str += it->title;
-    str += ASCIIToUTF16(it->is_app ? " app" : "");
-    str += ASCIIToUTF16(it->is_reloadable_ui ? " reloadable_ui" : "");
-    str += ASCIIToUTF16(it->is_playing_audio ? " playing_audio" : "");
-    str += ASCIIToUTF16(it->is_pinned ? " pinned" : "");
-    str += ASCIIToUTF16(it->is_discarded ? " discarded" : "");
+    str += base::ASCIIToUTF16(it->is_app ? " app" : "");
+    str += base::ASCIIToUTF16(it->is_reloadable_ui ? " reloadable_ui" : "");
+    str += base::ASCIIToUTF16(it->is_playing_audio ? " playing_audio" : "");
+    str += base::ASCIIToUTF16(it->is_pinned ? " pinned" : "");
+    str += base::ASCIIToUTF16(it->is_discarded ? " discarded" : "");
     titles.push_back(str);
   }
   return titles;
diff --git a/chrome/browser/chromeos/options/cert_library.cc b/chrome/browser/chromeos/options/cert_library.cc
index fe375ea..8c9ac18 100644
--- a/chrome/browser/chromeos/options/cert_library.cc
+++ b/chrome/browser/chromeos/options/cert_library.cc
@@ -42,10 +42,10 @@ base::string16 GetDisplayString(net::X509Certificate* cert, bool hardware_backed
     org = cert->subject().organization_names[0];
   if (org.empty())
     org = cert->subject().GetDisplayName();
-  base::string16 issued_by = UTF8ToUTF16(
+  base::string16 issued_by = base::UTF8ToUTF16(
       x509_certificate_model::GetIssuerCommonName(cert->os_cert_handle(),
                                                   org));  // alternative text
-  base::string16 issued_to = UTF8ToUTF16(
+  base::string16 issued_to = base::UTF8ToUTF16(
       x509_certificate_model::GetCertNameOrNickname(cert->os_cert_handle()));
 
   if (hardware_backed) {
diff --git a/chrome/browser/chromeos/options/passphrase_textfield.cc b/chrome/browser/chromeos/options/passphrase_textfield.cc
index 2cdc1d7..3370336 100644
--- a/chrome/browser/chromeos/options/passphrase_textfield.cc
+++ b/chrome/browser/chromeos/options/passphrase_textfield.cc
@@ -37,12 +37,12 @@ void PassphraseTextfield::OnBlur() {
 }
 
 std::string PassphraseTextfield::GetPassphrase() {
-  return changed_ ? UTF16ToUTF8(text()) : std::string();
+  return changed_ ? base::UTF16ToUTF8(text()) : std::string();
 }
 
 void PassphraseTextfield::SetFakePassphrase() {
   CR_DEFINE_STATIC_LOCAL(base::string16, fake_passphrase,
-      (ASCIIToUTF16("********")));
+      (base::ASCIIToUTF16("********")));
   SetText(fake_passphrase);
   changed_ = false;
 }
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index 574a5b0..edd4a4c 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -742,17 +742,17 @@ void VPNConfigView::InitFromProperties(
   provider_type_index_ = ProviderTypeToIndex(provider_type, client_cert_id_);
 
   if (service_text_)
-    service_text_->SetText(ASCIIToUTF16(vpn->name()));
+    service_text_->SetText(base::ASCIIToUTF16(vpn->name()));
   if (provider_type_text_label_)
     provider_type_text_label_->SetText(
         ProviderTypeIndexToString(provider_type_index_));
 
   if (server_textfield_ && !server_hostname.empty())
-    server_textfield_->SetText(UTF8ToUTF16(server_hostname));
+    server_textfield_->SetText(base::UTF8ToUTF16(server_hostname));
   if (username_textfield_ && !username.empty())
-    username_textfield_->SetText(UTF8ToUTF16(username));
+    username_textfield_->SetText(base::UTF8ToUTF16(username));
   if (group_name_textfield_ && !group_name.empty())
-    group_name_textfield_->SetText(UTF8ToUTF16(group_name));
+    group_name_textfield_->SetText(base::UTF8ToUTF16(group_name));
   if (psk_passphrase_textfield_)
     psk_passphrase_textfield_->SetShowFake(!psk_passphrase_required);
   if (save_credentials_checkbox_)
@@ -1024,7 +1024,7 @@ const std::string VPNConfigView::GetTextFromField(views::Textfield* textfield,
                                                   bool trim_whitespace) const {
   if (!textfield)
     return std::string();
-  std::string untrimmed = UTF16ToUTF8(textfield->text());
+  std::string untrimmed = base::UTF16ToUTF8(textfield->text());
   if (!trim_whitespace)
     return untrimmed;
   std::string result;
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 8bd223d..c0e1bcd 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -732,7 +732,7 @@ bool WifiConfigView::Login() {
 std::string WifiConfigView::GetSsid() const {
   std::string result;
   if (ssid_textfield_ != NULL) {
-    std::string untrimmed = UTF16ToUTF8(ssid_textfield_->text());
+    std::string untrimmed = base::UTF16ToUTF8(ssid_textfield_->text());
     TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result);
   }
   return result;
@@ -741,7 +741,7 @@ std::string WifiConfigView::GetSsid() const {
 std::string WifiConfigView::GetPassphrase() const {
   std::string result;
   if (passphrase_textfield_ != NULL)
-    result = UTF16ToUTF8(passphrase_textfield_->text());
+    result = base::UTF16ToUTF8(passphrase_textfield_->text());
   return result;
 }
 
@@ -820,7 +820,7 @@ bool WifiConfigView::GetEapUseSystemCas() const {
 
 std::string WifiConfigView::GetEapSubjectMatch() const {
   DCHECK(subject_match_textfield_);
-  return UTF16ToUTF8(subject_match_textfield_->text());
+  return base::UTF16ToUTF8(subject_match_textfield_->text());
 }
 
 std::string WifiConfigView::GetEapClientCertPkcs11Id() const {
@@ -837,12 +837,12 @@ std::string WifiConfigView::GetEapClientCertPkcs11Id() const {
 
 std::string WifiConfigView::GetEapIdentity() const {
   DCHECK(identity_textfield_);
-  return UTF16ToUTF8(identity_textfield_->text());
+  return base::UTF16ToUTF8(identity_textfield_->text());
 }
 
 std::string WifiConfigView::GetEapAnonymousIdentity() const {
   DCHECK(identity_anonymous_textfield_);
-  return UTF16ToUTF8(identity_anonymous_textfield_->text());
+  return base::UTF16ToUTF8(identity_anonymous_textfield_->text());
 }
 
 void WifiConfigView::SetEapProperties(base::DictionaryValue* properties) {
@@ -942,7 +942,7 @@ void WifiConfigView::Init(bool show_8021x) {
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID));
     layout->AddView(ssid_textfield_);
   } else {
-    views::Label* label = new views::Label(UTF8ToUTF16(wifi->name()));
+    views::Label* label = new views::Label(base::UTF8ToUTF16(wifi->name()));
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(label);
   }
@@ -1192,7 +1192,7 @@ void WifiConfigView::InitFromProperties(
     std::string passphrase;
     properties.GetStringWithoutPathExpansion(
         shill::kPassphraseProperty, &passphrase);
-    passphrase_textfield_->SetText(UTF8ToUTF16(passphrase));
+    passphrase_textfield_->SetText(base::UTF8ToUTF16(passphrase));
     return;
   }
 
@@ -1229,14 +1229,15 @@ void WifiConfigView::InitFromProperties(
     std::string eap_anonymous_identity;
     properties.GetStringWithoutPathExpansion(
         shill::kEapAnonymousIdentityProperty, &eap_anonymous_identity);
-    identity_anonymous_textfield_->SetText(UTF8ToUTF16(eap_anonymous_identity));
+    identity_anonymous_textfield_->SetText(
+        base::UTF8ToUTF16(eap_anonymous_identity));
   }
 
   // Subject match
   std::string subject_match;
   properties.GetStringWithoutPathExpansion(
       shill::kEapSubjectMatchProperty, &subject_match);
-  subject_match_textfield_->SetText(UTF8ToUTF16(subject_match));
+  subject_match_textfield_->SetText(base::UTF8ToUTF16(subject_match));
 
   // Server CA certificate.
   if (CaCertActive()) {
@@ -1288,14 +1289,14 @@ void WifiConfigView::InitFromProperties(
   std::string eap_identity;
   properties.GetStringWithoutPathExpansion(
       shill::kEapIdentityProperty, &eap_identity);
-  identity_textfield_->SetText(UTF8ToUTF16(eap_identity));
+  identity_textfield_->SetText(base::UTF8ToUTF16(eap_identity));
 
   // Passphrase
   if (PassphraseActive()) {
     std::string eap_password;
     properties.GetStringWithoutPathExpansion(
         shill::kEapPasswordProperty, &eap_password);
-    passphrase_textfield_->SetText(UTF8ToUTF16(eap_password));
+    passphrase_textfield_->SetText(base::UTF8ToUTF16(eap_password));
     // If 'Connectable' is True, show a fake passphrase to indicate that it
     // has already been set.
     bool connectable = false;
diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc
index 6a8e57f..5f59a25 100644
--- a/chrome/browser/chromeos/options/wimax_config_view.cc
+++ b/chrome/browser/chromeos/options/wimax_config_view.cc
@@ -174,11 +174,12 @@ bool WimaxConfigView::Login() {
 
 std::string WimaxConfigView::GetEapIdentity() const {
   DCHECK(identity_textfield_);
-  return UTF16ToUTF8(identity_textfield_->text());
+  return base::UTF16ToUTF8(identity_textfield_->text());
 }
 
 std::string WimaxConfigView::GetEapPassphrase() const {
-  return passphrase_textfield_ ? UTF16ToUTF8(passphrase_textfield_->text()) :
+  return passphrase_textfield_ ? base::UTF16ToUTF8(
+                                     passphrase_textfield_->text()) :
                                  std::string();
 }
 
@@ -230,7 +231,7 @@ void WimaxConfigView::Init() {
   layout->StartRow(0, column_view_set_id);
   layout->AddView(new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_TAB_NETWORK)));
-  views::Label* label = new views::Label(UTF8ToUTF16(wimax->name()));
+  views::Label* label = new views::Label(base::UTF8ToUTF16(wimax->name()));
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(label);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
@@ -360,7 +361,7 @@ void WimaxConfigView::InitFromProperties(
   std::string eap_identity;
   properties.GetStringWithoutPathExpansion(
       shill::kEapIdentityProperty, &eap_identity);
-  identity_textfield_->SetText(UTF8ToUTF16(eap_identity));
+  identity_textfield_->SetText(base::UTF8ToUTF16(eap_identity));
 
   // Save credentials
   if (save_credentials_checkbox_) {
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index 2e90224..8748bbc 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -252,8 +252,8 @@ bool DoesInstallSuccessReferToId(const std::string& id,
 bool DoesInstallFailureReferToId(const std::string& id,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
-  return content::Details<const base::string16>(details)->find(UTF8ToUTF16(id)) !=
-      base::string16::npos;
+  return content::Details<const base::string16>(details)->
+      find(base::UTF8ToUTF16(id)) != base::string16::npos;
 }
 
 scoped_ptr<net::FakeURLFetcher> RunCallbackAndReturnFakeURLFetcher(
@@ -453,7 +453,7 @@ static bool DisplayNameMatches(const std::string& account_id,
       chromeos::UserManager::Get()->FindUser(account_id);
   if (!user || user->display_name().empty())
     return false;
-  EXPECT_EQ(UTF8ToUTF16(display_name), user->display_name());
+  EXPECT_EQ(base::UTF8ToUTF16(display_name), user->display_name());
   return true;
 }
 
@@ -1156,15 +1156,15 @@ IN_PROC_BROWSER_TEST_P(TermsOfServiceTest, DISABLED_TermsOfServiceScreen) {
   // Verify that the screen's headings have been set correctly.
   EXPECT_EQ(
       l10n_util::GetStringFUTF8(IDS_TERMS_OF_SERVICE_SCREEN_HEADING,
-                                UTF8ToUTF16(kDomain)),
+                                base::UTF8ToUTF16(kDomain)),
       heading);
   EXPECT_EQ(
       l10n_util::GetStringFUTF8(IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING,
-                                UTF8ToUTF16(kDomain)),
+                                base::UTF8ToUTF16(kDomain)),
       subheading);
   EXPECT_EQ(
       l10n_util::GetStringFUTF8(IDS_TERMS_OF_SERVICE_SCREEN_CONTENT_HEADING,
-                                UTF8ToUTF16(kDomain)),
+                                base::UTF8ToUTF16(kDomain)),
       content_heading);
 
   if (!GetParam()) {
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
index 2ae4a07..82c8776 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
+++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
@@ -129,7 +129,7 @@ void RecommendationRestorerTest::CreateLoginProfile() {
   ASSERT_FALSE(restorer_);
   TestingProfile* profile = profile_manager_.CreateTestingProfile(
       chrome::kInitialProfile, prefs_owner_.Pass(),
-      UTF8ToUTF16(chrome::kInitialProfile), 0, std::string(),
+      base::UTF8ToUTF16(chrome::kInitialProfile), 0, std::string(),
       TestingProfile::TestingFactories());
   restorer_ = RecommendationRestorerFactory::GetForProfile(profile);
   EXPECT_TRUE(restorer_);
@@ -138,7 +138,7 @@ void RecommendationRestorerTest::CreateLoginProfile() {
 void RecommendationRestorerTest::CreateUserProfile() {
   ASSERT_FALSE(restorer_);
   TestingProfile* profile = profile_manager_.CreateTestingProfile(
-      "user", prefs_owner_.Pass(), UTF8ToUTF16("user"), 0, std::string(),
+      "user", prefs_owner_.Pass(), base::UTF8ToUTF16("user"), 0, std::string(),
       TestingProfile::TestingFactories());
   restorer_ = RecommendationRestorerFactory::GetForProfile(profile);
   EXPECT_TRUE(restorer_);
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
index 8a442c7..345d854 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
@@ -95,7 +95,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test {
                        FakeProfileOAuth2TokenService::Build));
     profile_ = profile_manager_->CreateTestingProfile(
         chrome::kInitialProfile, scoped_ptr<PrefServiceSyncable>(),
-        UTF8ToUTF16("testing_profile"), 0, std::string(), factories);
+        base::UTF8ToUTF16("testing_profile"), 0, std::string(), factories);
     signin_profile_ = profile_manager_->CreateTestingProfile(kSigninProfile);
     signin_profile_->ForceIncognito(true);
     // Usually the signin Profile and the main Profile are separate, but since
diff --git a/chrome/browser/chromeos/power/peripheral_battery_observer.cc b/chrome/browser/chromeos/power/peripheral_battery_observer.cc
index 6b38fcd..aed7048 100644
--- a/chrome/browser/chromeos/power/peripheral_battery_observer.cc
+++ b/chrome/browser/chromeos/power/peripheral_battery_observer.cc
@@ -219,11 +219,11 @@ bool PeripheralBatteryObserver::PostNotification(const std::string& address,
       GURL(kNotificationOriginUrl),
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_NOTIFICATION_PERIPHERAL_BATTERY_LOW),
-      UTF8ToUTF16(battery.name),
+      base::UTF8ToUTF16(battery.name),
       string_text,
       blink::WebTextDirectionDefault,
       base::string16(),
-      UTF8ToUTF16(address),
+      base::UTF8ToUTF16(address),
       new PeripheralBatteryNotificationDelegate(address));
 
   notification_manager->Add(
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
index d83f8f8..b44fa65 100644
--- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
@@ -25,6 +25,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using base::ASCIIToUTF16;
+
 namespace {
 
 // As defined in /chromeos/dbus/cryptohome_client.cc.
diff --git a/chrome/browser/chromeos/status/data_promo_notification.cc b/chrome/browser/chromeos/status/data_promo_notification.cc
index 0a49377..c1a4891 100644
--- a/chrome/browser/chromeos/status/data_promo_notification.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification.cc
@@ -194,7 +194,7 @@ void DataPromoNotification::ShowOptionalMobileDataPromoNotification() {
     const std::string locale = g_browser_process->GetApplicationLocale();
     std::string deal_text =
         deal->GetLocalizedString(locale, "notification_text");
-    message = UTF8ToUTF16(deal_text + "\n\n") + message;
+    message = base::UTF8ToUTF16(deal_text + "\n\n") + message;
     info_url = deal->info_url();
     if (info_url.empty() && carrier)
       info_url = carrier->top_up_url();
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 6d33ace..04d5c51 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -353,10 +353,10 @@ void MainMenuModel::AddWirelessNetworkMenuItem(const NetworkState* network,
   if (network->IsConnectingState()) {
     label = l10n_util::GetStringFUTF16(
         IDS_STATUSBAR_NETWORK_DEVICE_STATUS,
-        UTF8ToUTF16(wifi_name),
+        base::UTF8ToUTF16(wifi_name),
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING));
   } else {
-    label = UTF8ToUTF16(wifi_name);
+    label = base::UTF8ToUTF16(wifi_name);
   }
 
   // We do not have convenient access to whether or not it might be possible
@@ -436,10 +436,10 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) {
       if (network->IsConnectingState()) {
         label = l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_DEVICE_STATUS,
-            UTF8ToUTF16(network_name),
+            base::UTF8ToUTF16(network_name),
             l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING));
       } else {
-        label = UTF8ToUTF16(network_name);
+        label = base::UTF8ToUTF16(network_name);
       }
 
       int flag = FLAG_CELLULAR;
@@ -617,9 +617,9 @@ void MoreMenuModel::InitMenuItems(bool should_open_button_options) {
   if (default_network) {
     std::string ip_address = default_network->ip_address();
     if (!ip_address.empty()) {
-      address_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
-          ASCIIToUTF16(ip_address), gfx::ImageSkia(), std::string(),
-                       FLAG_DISABLED));
+      address_items.push_back(MenuItem(
+          ui::MenuModel::TYPE_COMMAND, base::ASCIIToUTF16(ip_address),
+          gfx::ImageSkia(), std::string(), FLAG_DISABLED));
     }
   }
 
@@ -629,8 +629,8 @@ void MoreMenuModel::InitMenuItems(bool should_open_button_options) {
     std::string label = l10n_util::GetStringUTF8(
         IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET) + " " + ethernet_address;
     address_items.push_back(MenuItem(
-        ui::MenuModel::TYPE_COMMAND,
-        UTF8ToUTF16(label), gfx::ImageSkia(), std::string(), FLAG_DISABLED));
+        ui::MenuModel::TYPE_COMMAND, base::UTF8ToUTF16(label),
+        gfx::ImageSkia(), std::string(), FLAG_DISABLED));
   }
 
   std::string wifi_address =
@@ -639,8 +639,8 @@ void MoreMenuModel::InitMenuItems(bool should_open_button_options) {
     std::string label = l10n_util::GetStringUTF8(
         IDS_STATUSBAR_NETWORK_DEVICE_WIFI) + " " + wifi_address;
     address_items.push_back(MenuItem(
-        ui::MenuModel::TYPE_COMMAND,
-        UTF8ToUTF16(label), gfx::ImageSkia(), std::string(), FLAG_DISABLED));
+        ui::MenuModel::TYPE_COMMAND, base::UTF8ToUTF16(label),
+        gfx::ImageSkia(), std::string(), FLAG_DISABLED));
   }
 
   menu_items_ = link_items;
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 5a49a4d..153a18c 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -435,7 +435,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
     if (GetEnterpriseDomain().empty())
         return base::string16();
     return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
-                                      UTF8ToUTF16(GetEnterpriseDomain()));
+                                      base::UTF8ToUTF16(GetEnterpriseDomain()));
   }
 
   virtual const std::string GetLocallyManagedUserManager() const OVERRIDE {
@@ -460,7 +460,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
         return base::string16();
     return l10n_util::GetStringFUTF16(
         IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE,
-        UTF8ToUTF16(GetLocallyManagedUserManager()));
+        base::UTF8ToUTF16(GetLocallyManagedUserManager()));
   }
 
   virtual bool SystemShouldUpgrade() const OVERRIDE {
diff --git a/chrome/browser/chromeos/system/timezone_util.cc b/chrome/browser/chromeos/system/timezone_util.cc
index 7308632..e396942 100644
--- a/chrome/browser/chromeos/system/timezone_util.cc
+++ b/chrome/browser/chromeos/system/timezone_util.cc
@@ -78,7 +78,7 @@ base::string16 GetExemplarCity(const icu::TimeZone& zone) {
     zone_id_str.erase(0, slash_pos + 1);
   // zone id has '_' in place of ' '.
   ReplaceSubstringsAfterOffset(&zone_id_str, 0, "_", " ");
-  return ASCIIToUTF16(zone_id_str);
+  return base::ASCIIToUTF16(zone_id_str);
 }
 
 // Gets the given timezone's name for visualization.
@@ -113,8 +113,10 @@ base::string16 GetTimezoneName(const icu::TimeZone& timezone) {
   icu::UnicodeString name;
   timezone.getDisplayName(dst_offset != 0, icu::TimeZone::LONG, name);
   base::string16 result(l10n_util::GetStringFUTF16(
-      IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE, ASCIIToUTF16(offset_str),
-      base::string16(name.getBuffer(), name.length()), GetExemplarCity(timezone)));
+      IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE,
+      base::ASCIIToUTF16(offset_str),
+      base::string16(name.getBuffer(), name.length()),
+      GetExemplarCity(timezone)));
   base::i18n::AdjustStringForLocaleDirection(&result);
   return result;
 }