Update uses of UTF conversions in ui/ to use the base:: namespace.

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

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

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

36 files changed, 127 insertions, 110 deletions

diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index 4439af5..de3cbf2 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -206,7 +206,7 @@ base::string16 Accelerator::GetShortcutText() const {
         shortcut +=
             static_cast<base::string16::value_type>(g_ascii_toupper(name[0]));
       else
-        shortcut += UTF8ToUTF16(name);
+        shortcut += base::UTF8ToUTF16(name);
     }
 #endif
   } else {
@@ -262,7 +262,7 @@ base::string16 Accelerator::GetShortcutText() const {
   if (adjust_shortcut_for_rtl) {
     int key_length = static_cast<int>(shortcut_rtl.length());
     DCHECK_GT(key_length, 0);
-    shortcut_rtl.append(ASCIIToUTF16("+"));
+    shortcut_rtl.append(base::ASCIIToUTF16("+"));
 
     // Subtracting the size of the shortcut key and 1 for the '+' sign.
     shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc
index 3e56ecd..e5e2a96 100644
--- a/ui/base/clipboard/clipboard_android.cc
+++ b/ui/base/clipboard/clipboard_android.cc
@@ -264,7 +264,7 @@ void Clipboard::ReadText(ClipboardType type, base::string16* result) const {
   DCHECK_EQ(type, CLIPBOARD_TYPE_COPY_PASTE);
   std::string utf8;
   ReadAsciiText(type, &utf8);
-  *result = UTF8ToUTF16(utf8);
+  *result = base::UTF8ToUTF16(utf8);
 }
 
 void Clipboard::ReadAsciiText(ClipboardType type, std::string* result) const {
@@ -285,7 +285,7 @@ void Clipboard::ReadHTML(ClipboardType type,
     src_url->clear();
 
   std::string input = g_map.Get().Get(kHTMLFormat);
-  *markup = UTF8ToUTF16(input);
+  *markup = base::UTF8ToUTF16(input);
 
   *fragment_start = 0;
   *fragment_end = static_cast<uint32>(markup->length());
diff --git a/ui/base/clipboard/clipboard_aura.cc b/ui/base/clipboard/clipboard_aura.cc
index 6fe2ff36..ab4cf3e 100644
--- a/ui/base/clipboard/clipboard_aura.cc
+++ b/ui/base/clipboard/clipboard_aura.cc
@@ -189,7 +189,7 @@ class AuraClipboard {
   void ReadText(base::string16* result) const {
     std::string utf8_result;
     ReadAsciiText(&utf8_result);
-    *result = UTF8ToUTF16(utf8_result);
+    *result = base::UTF8ToUTF16(utf8_result);
   }
 
   // Reads ascii text from the data at the top of clipboard stack.
@@ -221,7 +221,7 @@ class AuraClipboard {
       return;
 
     const ClipboardData* data = GetData();
-    *markup = UTF8ToUTF16(data->markup_data());
+    *markup = base::UTF8ToUTF16(data->markup_data());
     *src_url = data->url();
 
     *fragment_start = 0;
@@ -272,7 +272,7 @@ class AuraClipboard {
       return;
 
     const ClipboardData* data = GetData();
-    *title = UTF8ToUTF16(data->bookmark_title());
+    *title = base::UTF8ToUTF16(data->bookmark_title());
     *url = data->bookmark_url();
   }
 
@@ -493,13 +493,13 @@ void Clipboard::ReadAvailableTypes(ClipboardType type,
   types->clear();
   *contains_filenames = false;
   if (IsFormatAvailable(GetPlainTextFormatType(), type))
-    types->push_back(UTF8ToUTF16(GetPlainTextFormatType().ToString()));
+    types->push_back(base::UTF8ToUTF16(GetPlainTextFormatType().ToString()));
   if (IsFormatAvailable(GetHtmlFormatType(), type))
-    types->push_back(UTF8ToUTF16(GetHtmlFormatType().ToString()));
+    types->push_back(base::UTF8ToUTF16(GetHtmlFormatType().ToString()));
   if (IsFormatAvailable(GetRtfFormatType(), type))
-    types->push_back(UTF8ToUTF16(GetRtfFormatType().ToString()));
+    types->push_back(base::UTF8ToUTF16(GetRtfFormatType().ToString()));
   if (IsFormatAvailable(GetBitmapFormatType(), type))
-    types->push_back(UTF8ToUTF16(kMimeTypePNG));
+    types->push_back(base::UTF8ToUTF16(kMimeTypePNG));
 
   AuraClipboard* clipboard = GetClipboard();
   if (clipboard->IsFormatAvailable(CUSTOM) && clipboard->GetData()) {
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
index 3c75154..3be15de 100644
--- a/ui/base/clipboard/clipboard_aurax11.cc
+++ b/ui/base/clipboard/clipboard_aurax11.cc
@@ -581,13 +581,13 @@ void Clipboard::ReadAvailableTypes(ClipboardType type,
   types->clear();
 
   if (target_list.ContainsText())
-    types->push_back(UTF8ToUTF16(kMimeTypeText));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeText));
   if (target_list.ContainsFormat(GetHtmlFormatType()))
-    types->push_back(UTF8ToUTF16(kMimeTypeHTML));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeHTML));
   if (target_list.ContainsFormat(GetRtfFormatType()))
-    types->push_back(UTF8ToUTF16(kMimeTypeRTF));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeRTF));
   if (target_list.ContainsFormat(GetBitmapFormatType()))
-    types->push_back(UTF8ToUTF16(kMimeTypePNG));
+    types->push_back(base::UTF8ToUTF16(kMimeTypePNG));
   *contains_filenames = false;
 
   SelectionData data(aurax11_details_->RequestAndWaitForTypes(
@@ -603,7 +603,7 @@ void Clipboard::ReadText(ClipboardType type, base::string16* result) const {
       type, aurax11_details_->GetTextAtoms()));
   if (data.IsValid()) {
     std::string text = data.GetText();
-    *result = UTF8ToUTF16(text);
+    *result = base::UTF8ToUTF16(text);
   }
 }
 
@@ -736,8 +736,8 @@ void Clipboard::WriteBookmark(const char* title_data,
                               const char* url_data,
                               size_t url_len) {
   // Write as a mozilla url (UTF16: URL, newline, title).
-  base::string16 url = UTF8ToUTF16(std::string(url_data, url_len) + "\n");
-  base::string16 title = UTF8ToUTF16(std::string(title_data, title_len));
+  base::string16 url = base::UTF8ToUTF16(std::string(url_data, url_len) + "\n");
+  base::string16 title = base::UTF8ToUTF16(std::string(title_data, title_len));
 
   std::vector<unsigned char> data;
   ui::AddString16ToVector(url, &data);
diff --git a/ui/base/clipboard/clipboard_gtk.cc b/ui/base/clipboard/clipboard_gtk.cc
index eebcc5e..8f81911 100644
--- a/ui/base/clipboard/clipboard_gtk.cc
+++ b/ui/base/clipboard/clipboard_gtk.cc
@@ -317,8 +317,8 @@ void Clipboard::WriteBitmap(const SkBitmap& bitmap) {
 void Clipboard::WriteBookmark(const char* title_data, size_t title_len,
                               const char* url_data, size_t url_len) {
   // Write as a mozilla url (UTF16: URL, newline, title).
-  base::string16 url = UTF8ToUTF16(std::string(url_data, url_len) + "\n");
-  base::string16 title = UTF8ToUTF16(std::string(title_data, title_len));
+  base::string16 url = base::UTF8ToUTF16(std::string(url_data, url_len) + "\n");
+  base::string16 title = base::UTF8ToUTF16(std::string(title_data, title_len));
   if (title.length() >= std::numeric_limits<size_t>::max() / 4 ||
       url.length() >= std::numeric_limits<size_t>::max() / 4)
     return;
@@ -417,13 +417,13 @@ void Clipboard::ReadAvailableTypes(ClipboardType type,
 
   types->clear();
   if (IsFormatAvailable(GetPlainTextFormatType(), type))
-    types->push_back(UTF8ToUTF16(kMimeTypeText));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeText));
   if (IsFormatAvailable(GetHtmlFormatType(), type))
-    types->push_back(UTF8ToUTF16(kMimeTypeHTML));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeHTML));
   if (IsFormatAvailable(GetRtfFormatType(), type))
-    types->push_back(UTF8ToUTF16(kMimeTypeRTF));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeRTF));
   if (IsFormatAvailable(GetBitmapFormatType(), type))
-    types->push_back(UTF8ToUTF16(kMimeTypePNG));
+    types->push_back(base::UTF8ToUTF16(kMimeTypePNG));
   *contains_filenames = false;
 
   GtkClipboard* clipboard = LookupBackingClipboard(type);
@@ -454,7 +454,7 @@ void Clipboard::ReadText(ClipboardType type, base::string16* result) const {
     return;
 
   // TODO(estade): do we want to handle the possible error here?
-  UTF8ToUTF16(text, strlen(text), result);
+  base::UTF8ToUTF16(text, strlen(text), result);
   g_free(text);
 }
 
@@ -508,7 +508,8 @@ void Clipboard::ReadHTML(ClipboardType type,
     markup->assign(reinterpret_cast<const uint16_t*>(raw_data) + 1,
                    (data_length / 2) - 1);
   } else {
-    UTF8ToUTF16(reinterpret_cast<const char*>(raw_data), data_length, markup);
+    base::UTF8ToUTF16(
+        reinterpret_cast<const char*>(raw_data), data_length, markup);
   }
 
   // If there is a terminating NULL, drop it.
diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm
index a774db0..0d0b2fa 100644
--- a/ui/base/clipboard/clipboard_mac.mm
+++ b/ui/base/clipboard/clipboard_mac.mm
@@ -228,13 +228,13 @@ void Clipboard::ReadAvailableTypes(ClipboardType type,
   DCHECK(CalledOnValidThread());
   types->clear();
   if (IsFormatAvailable(Clipboard::GetPlainTextFormatType(), type))
-    types->push_back(UTF8ToUTF16(kMimeTypeText));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeText));
   if (IsFormatAvailable(Clipboard::GetHtmlFormatType(), type))
-    types->push_back(UTF8ToUTF16(kMimeTypeHTML));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeHTML));
   if (IsFormatAvailable(Clipboard::GetRtfFormatType(), type))
-    types->push_back(UTF8ToUTF16(kMimeTypeRTF));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeRTF));
   if ([NSImage canInitWithPasteboard:GetPasteboard()])
-    types->push_back(UTF8ToUTF16(kMimeTypePNG));
+    types->push_back(base::UTF8ToUTF16(kMimeTypePNG));
   *contains_filenames = false;
 
   NSPasteboard* pb = GetPasteboard();
@@ -251,9 +251,7 @@ void Clipboard::ReadText(ClipboardType type, base::string16* result) const {
   NSPasteboard* pb = GetPasteboard();
   NSString* contents = [pb stringForType:NSStringPboardType];
 
-  UTF8ToUTF16([contents UTF8String],
-              [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
-              result);
+  *result = base::SysNSStringToUTF16(contents);
 }
 
 void Clipboard::ReadAsciiText(ClipboardType type, std::string* result) const {
@@ -291,9 +289,7 @@ void Clipboard::ReadHTML(ClipboardType type,
     NSString* contents = [pb stringForType:bestType];
     if ([bestType isEqualToString:NSRTFPboardType])
       contents = [pb htmlFromRtf];
-    UTF8ToUTF16([contents UTF8String],
-                [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
-                markup);
+    *markup = base::SysNSStringToUTF16(contents);
   }
 
   *fragment_start = 0;
@@ -346,9 +342,7 @@ void Clipboard::ReadBookmark(base::string16* title, std::string* url) const {
 
   if (title) {
     NSString* contents = [pb stringForType:kUTTypeURLName];
-    UTF8ToUTF16([contents UTF8String],
-                [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
-                title);
+    *title = base::SysNSStringToUTF16(contents);
   }
 
   if (url) {
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc
index 0325b75..5ddec42 100644
--- a/ui/base/clipboard/clipboard_unittest.cc
+++ b/ui/base/clipboard/clipboard_unittest.cc
@@ -31,6 +31,10 @@
 #include "base/android/jni_string.h"
 #endif
 
+using base::ASCIIToUTF16;
+using base::UTF8ToUTF16;
+using base::UTF16ToUTF8;
+
 namespace ui {
 
 class ClipboardTest : public PlatformTest {
diff --git a/ui/base/clipboard/clipboard_util_win.cc b/ui/base/clipboard/clipboard_util_win.cc
index 0321a96..cc5a0ee 100644
--- a/ui/base/clipboard/clipboard_util_win.cc
+++ b/ui/base/clipboard/clipboard_util_win.cc
@@ -119,7 +119,7 @@ bool GetFileUrl(IDataObject* data_object, base::string16* url,
         DWORD file_url_len = arraysize(file_url);
         if (SUCCEEDED(::UrlCreateFromPathA(data.get(), file_url, &file_url_len,
                                            0))) {
-          url->assign(UTF8ToWide(file_url));
+          url->assign(base::UTF8ToWide(file_url));
           title->assign(*url);
           success = true;
         }
@@ -191,7 +191,7 @@ bool ClipboardUtil::GetUrl(IDataObject* data_object,
     {
       // URL using ascii
       base::win::ScopedHGlobal<char> data(store.hGlobal);
-      SplitUrlAndTitle(UTF8ToWide(data.get()), url, title);
+      SplitUrlAndTitle(base::UTF8ToWide(data.get()), url, title);
     }
     ReleaseStgMedium(&store);
     return true;
@@ -255,7 +255,7 @@ bool ClipboardUtil::GetPlainText(IDataObject* data_object,
     {
       // ascii text
       base::win::ScopedHGlobal<char> data(store.hGlobal);
-      plain_text->assign(UTF8ToWide(data.get()));
+      plain_text->assign(base::UTF8ToWide(data.get()));
     }
     ReleaseStgMedium(&store);
     return true;
@@ -280,7 +280,7 @@ bool ClipboardUtil::GetHtml(IDataObject* data_object,
 
       std::string html_utf8;
       CFHtmlToHtml(std::string(data.get(), data.Size()), &html_utf8, base_url);
-      html->assign(UTF8ToWide(html_utf8));
+      html->assign(base::UTF8ToWide(html_utf8));
     }
     ReleaseStgMedium(&store);
     return true;
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index b2f6e0c..fff7502 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -228,7 +228,7 @@ void Clipboard::WriteObjects(ClipboardType type, const ObjectMap& objects) {
 
 void Clipboard::WriteText(const char* text_data, size_t text_len) {
   base::string16 text;
-  UTF8ToUTF16(text_data, text_len, &text);
+  base::UTF8ToUTF16(text_data, text_len, &text);
   HGLOBAL glob = CreateGlobalData(text);
 
   WriteToClipboard(CF_UNICODETEXT, glob);
@@ -262,7 +262,7 @@ void Clipboard::WriteBookmark(const char* title_data,
   bookmark.append(1, L'\n');
   bookmark.append(url_data, url_len);
 
-  base::string16 wide_bookmark = UTF8ToWide(bookmark);
+  base::string16 wide_bookmark = base::UTF8ToWide(bookmark);
   HGLOBAL glob = CreateGlobalData(wide_bookmark);
 
   WriteToClipboard(GetUrlWFormatType().ToUINT(), glob);
@@ -404,13 +404,13 @@ void Clipboard::ReadAvailableTypes(ClipboardType type,
 
   types->clear();
   if (::IsClipboardFormatAvailable(GetPlainTextFormatType().ToUINT()))
-    types->push_back(UTF8ToUTF16(kMimeTypeText));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeText));
   if (::IsClipboardFormatAvailable(GetHtmlFormatType().ToUINT()))
-    types->push_back(UTF8ToUTF16(kMimeTypeHTML));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeHTML));
   if (::IsClipboardFormatAvailable(GetRtfFormatType().ToUINT()))
-    types->push_back(UTF8ToUTF16(kMimeTypeRTF));
+    types->push_back(base::UTF8ToUTF16(kMimeTypeRTF));
   if (::IsClipboardFormatAvailable(CF_DIB))
-    types->push_back(UTF8ToUTF16(kMimeTypePNG));
+    types->push_back(base::UTF8ToUTF16(kMimeTypePNG));
   *contains_filenames = false;
 
   // Acquire the clipboard.
@@ -661,7 +661,7 @@ void Clipboard::ReadData(const FormatType& format, std::string* result) const {
 void Clipboard::ParseBookmarkClipboardFormat(const base::string16& bookmark,
                                              base::string16* title,
                                              std::string* url) {
-  const base::string16 kDelim = ASCIIToUTF16("\r\n");
+  const base::string16 kDelim = base::ASCIIToUTF16("\r\n");
 
   const size_t title_end = bookmark.find_first_of(kDelim);
   if (title)
@@ -669,8 +669,10 @@ void Clipboard::ParseBookmarkClipboardFormat(const base::string16& bookmark,
 
   if (url) {
     const size_t url_start = bookmark.find_first_not_of(kDelim, title_end);
-    if (url_start != base::string16::npos)
-      *url = UTF16ToUTF8(bookmark.substr(url_start, base::string16::npos));
+    if (url_start != base::string16::npos) {
+      *url = base::UTF16ToUTF8(
+          bookmark.substr(url_start, base::string16::npos));
+    }
   }
 }
 
@@ -678,7 +680,7 @@ void Clipboard::ParseBookmarkClipboardFormat(const base::string16& bookmark,
 Clipboard::FormatType Clipboard::GetFormatType(
     const std::string& format_string) {
   return FormatType(
-      ::RegisterClipboardFormat(ASCIIToWide(format_string).c_str()));
+      ::RegisterClipboardFormat(base::ASCIIToWide(format_string).c_str()));
 }
 
 // static
diff --git a/ui/base/clipboard/custom_data_helper_unittest.cc b/ui/base/clipboard/custom_data_helper_unittest.cc
index c770445..bc79d90 100644
--- a/ui/base/clipboard/custom_data_helper_unittest.cc
+++ b/ui/base/clipboard/custom_data_helper_unittest.cc
@@ -10,6 +10,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::ASCIIToUTF16;
+
 namespace ui {
 
 namespace {
diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
index 120832f..380b8d2 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -36,7 +36,7 @@ void ScopedClipboardWriter::WriteURL(const base::string16& text) {
 
 void ScopedClipboardWriter::WriteHTML(const base::string16& markup,
                                       const std::string& source_url) {
-  std::string utf8_markup = UTF16ToUTF8(markup);
+  std::string utf8_markup = base::UTF16ToUTF8(markup);
 
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(
@@ -62,7 +62,7 @@ void ScopedClipboardWriter::WriteBookmark(const base::string16& bookmark_title,
   if (bookmark_title.empty() || url.empty())
     return;
 
-  std::string utf8_markup = UTF16ToUTF8(bookmark_title);
+  std::string utf8_markup = base::UTF16ToUTF8(bookmark_title);
 
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(Clipboard::ObjectMapParam(utf8_markup.begin(),
@@ -80,9 +80,9 @@ void ScopedClipboardWriter::WriteHyperlink(const base::string16& anchor_text,
   std::string html("<a href=\"");
   html.append(net::EscapeForHTML(url));
   html.append("\">");
-  html.append(net::EscapeForHTML(UTF16ToUTF8(anchor_text)));
+  html.append(net::EscapeForHTML(base::UTF16ToUTF8(anchor_text)));
   html.append("</a>");
-  WriteHTML(UTF8ToUTF16(html), std::string());
+  WriteHTML(base::UTF8ToUTF16(html), std::string());
 }
 
 void ScopedClipboardWriter::WriteWebSmartPaste() {
@@ -113,7 +113,7 @@ void ScopedClipboardWriter::Reset() {
 
 void ScopedClipboardWriter::WriteTextOrURL(const base::string16& text,
                                            bool is_url) {
-  std::string utf8_text = UTF16ToUTF8(text);
+  std::string utf8_text = base::UTF16ToUTF8(text);
 
   Clipboard::ObjectMapParams parameters;
   parameters.push_back(Clipboard::ObjectMapParam(utf8_text.begin(),
diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm
index d3fa777..9e54ee8 100644
--- a/ui/base/cocoa/menu_controller_unittest.mm
+++ b/ui/base/cocoa/menu_controller_unittest.mm
@@ -16,6 +16,8 @@
 #import "ui/base/test/ui_cocoa_test_helper.h"
 #include "ui/gfx/image/image.h"
 
+using base::ASCIIToUTF16;
+
 namespace ui {
 
 namespace {
diff --git a/ui/base/dragdrop/gtk_dnd_util.cc b/ui/base/dragdrop/gtk_dnd_util.cc
index 899758b..163dce4 100644
--- a/ui/base/dragdrop/gtk_dnd_util.cc
+++ b/ui/base/dragdrop/gtk_dnd_util.cc
@@ -159,7 +159,7 @@ void WriteURLWithName(GtkSelectionData* selection_data,
   if (title.empty()) {
     // We prefer to not have empty titles. Set it to the filename extracted
     // from the URL.
-    title = UTF8ToUTF16(url.ExtractFileName());
+    title = base::UTF8ToUTF16(url.ExtractFileName());
   }
 
   switch (type) {
@@ -178,7 +178,7 @@ void WriteURLWithName(GtkSelectionData* selection_data,
     }
     case CHROME_NAMED_URL: {
       Pickle pickle;
-      pickle.WriteString(UTF16ToUTF8(title));
+      pickle.WriteString(base::UTF16ToUTF8(title));
       pickle.WriteString(url.spec());
       gtk_selection_data_set(
           selection_data,
@@ -190,7 +190,7 @@ void WriteURLWithName(GtkSelectionData* selection_data,
     }
     case NETSCAPE_URL: {
       // _NETSCAPE_URL format is URL + \n + title.
-      std::string utf8_text = url.spec() + "\n" + UTF16ToUTF8(title);
+      std::string utf8_text = url.spec() + "\n" + base::UTF16ToUTF8(title);
       gtk_selection_data_set(selection_data,
                              gtk_selection_data_get_target(selection_data),
                              kBitsPerByte,
@@ -228,7 +228,7 @@ bool ExtractNamedURL(GtkSelectionData* selection_data,
     return false;
 
   *url = gurl;
-  *title = UTF8ToUTF16(title_utf8);
+  *title = base::UTF8ToUTF16(title_utf8);
   return true;
 }
 
@@ -268,7 +268,7 @@ bool ExtractNetscapeURL(GtkSelectionData* selection_data,
     return false;
 
   *url = gurl;
-  *title = UTF8ToUTF16(data.substr(newline + 1));
+  *title = base::UTF8ToUTF16(data.substr(newline + 1));
   return true;
 }
 
diff --git a/ui/base/dragdrop/gtk_dnd_util_unittest.cc b/ui/base/dragdrop/gtk_dnd_util_unittest.cc
index 04f81ae..977b67b 100644
--- a/ui/base/dragdrop/gtk_dnd_util_unittest.cc
+++ b/ui/base/dragdrop/gtk_dnd_util_unittest.cc
@@ -29,7 +29,7 @@ TEST(GtkDndUtilTest, ExtractNamedURLValid) {
   GURL url;
   base::string16 title;
   ASSERT_EQ(true, ui::ExtractNamedURL(&data, &url, &title));
-  EXPECT_EQ(UTF8ToUTF16(kTitle), title);
+  EXPECT_EQ(base::UTF8ToUTF16(kTitle), title);
   EXPECT_EQ(GURL(kUrl), url);
 }
 
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc
index c335120..bd1545d 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aura.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc
@@ -44,7 +44,7 @@ void OSExchangeDataProviderAura::SetURL(const GURL& url,
   title_ = title;
   formats_ |= OSExchangeData::URL;
 
-  SetString(UTF8ToUTF16(url.spec()));
+  SetString(base::UTF8ToUTF16(url.spec()));
 }
 
 void OSExchangeDataProviderAura::SetFilename(const base::FilePath& path) {
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc b/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
index 551ef3b..d0eeb6a 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
@@ -109,7 +109,7 @@ OSExchangeData::Provider* OSExchangeDataProviderAuraX11::Clone() const {
 }
 
 void OSExchangeDataProviderAuraX11::SetString(const base::string16& text_data) {
-  std::string utf8 = UTF16ToUTF8(text_data);
+  std::string utf8 = base::UTF16ToUTF8(text_data);
   scoped_refptr<base::RefCountedMemory> mem(
       base::RefCountedString::TakeString(&utf8));
 
@@ -123,11 +123,11 @@ void OSExchangeDataProviderAuraX11::SetURL(const GURL& url,
                                            const base::string16& title) {
   // Mozilla's URL format: (UTF16: URL, newline, title)
   if (url.is_valid()) {
-    base::string16 spec = UTF8ToUTF16(url.spec());
+    base::string16 spec = base::UTF8ToUTF16(url.spec());
 
     std::vector<unsigned char> data;
     ui::AddString16ToVector(spec, &data);
-    ui::AddString16ToVector(ASCIIToUTF16("\n"), &data);
+    ui::AddString16ToVector(base::ASCIIToUTF16("\n"), &data);
     ui::AddString16ToVector(title, &data);
     scoped_refptr<base::RefCountedMemory> mem(
         base::RefCountedBytes::TakeVector(&data));
@@ -169,7 +169,7 @@ bool OSExchangeDataProviderAuraX11::GetString(base::string16* result) const {
   ui::SelectionData data(format_map_.GetFirstOf(requested_types));
   if (data.IsValid()) {
     std::string text = data.GetText();
-    *result = UTF8ToUTF16(text);
+    *result = base::UTF8ToUTF16(text);
     return true;
   }
 
@@ -195,7 +195,7 @@ bool OSExchangeDataProviderAuraX11::GetURLAndTitle(
       data.AssignTo(&unparsed);
 
       std::vector<base::string16> tokens;
-      size_t num_tokens = Tokenize(unparsed, ASCIIToUTF16("\n"), &tokens);
+      size_t num_tokens = Tokenize(unparsed, base::ASCIIToUTF16("\n"), &tokens);
       if (num_tokens > 0) {
         if (num_tokens > 1)
           *title = tokens[1];
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc b/ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc
index 0cc8f2f0..a09198d 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc
@@ -22,12 +22,12 @@ TEST(OSExchangeDataProviderAuraX11Test, MozillaURL) {
   ui::OSExchangeDataProviderAuraX11 provider;
 
   // Check that we can get titled entries.
-  provider.SetURL(GURL(kGoogleURL), ASCIIToUTF16(kGoogleTitle));
+  provider.SetURL(GURL(kGoogleURL), base::ASCIIToUTF16(kGoogleTitle));
   {
     GURL out_gurl;
     base::string16 out_str;
     EXPECT_TRUE(provider.GetURLAndTitle(&out_gurl, &out_str));
-    EXPECT_EQ(ASCIIToUTF16(kGoogleTitle), out_str);
+    EXPECT_EQ(base::ASCIIToUTF16(kGoogleTitle), out_str);
     EXPECT_EQ(kGoogleURL, out_gurl.spec());
   }
 
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
index 69203f0..9b16b02 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -275,7 +275,7 @@ void OSExchangeDataProviderWin::SetString(const base::string16& data) {
       Clipboard::GetPlainTextWFormatType().ToFormatEtc(), storage));
 
   // Also add the UTF8-encoded version.
-  storage = GetStorageForString(UTF16ToUTF8(data));
+  storage = GetStorageForString(base::UTF16ToUTF8(data));
   data_->contents_.push_back(new DataObjectImpl::StoredDataInfo(
       Clipboard::GetPlainTextFormatType().ToFormatEtc(), storage));
 }
@@ -289,7 +289,7 @@ void OSExchangeDataProviderWin::SetURL(const GURL& url,
   // will fail! It assumes an insertion order.
 
   // Add text/x-moz-url for drags from Firefox
-  base::string16 x_moz_url_str = UTF8ToUTF16(url.spec());
+  base::string16 x_moz_url_str = base::UTF8ToUTF16(url.spec());
   x_moz_url_str += '\n';
   x_moz_url_str += title;
   STGMEDIUM* storage = GetStorageForString(x_moz_url_str);
@@ -304,7 +304,7 @@ void OSExchangeDataProviderWin::SetURL(const GURL& url,
   SetFileContents(base::FilePath(valid_file_name), shortcut_url_file_contents);
 
   // Add a UniformResourceLocator link for apps like IE and Word.
-  storage = GetStorageForString(UTF8ToUTF16(url.spec()));
+  storage = GetStorageForString(base::UTF8ToUTF16(url.spec()));
   data_->contents_.push_back(new DataObjectImpl::StoredDataInfo(
       Clipboard::GetUrlWFormatType().ToFormatEtc(), storage));
   storage = GetStorageForString(url.spec());
@@ -316,7 +316,7 @@ void OSExchangeDataProviderWin::SetURL(const GURL& url,
 
   // Also add text representations (these should be last since they're the
   // least preferable).
-  SetString(UTF8ToUTF16(url.spec()));
+  SetString(base::UTF8ToUTF16(url.spec()));
 }
 
 void OSExchangeDataProviderWin::SetFilename(const base::FilePath& path) {
@@ -368,7 +368,7 @@ void OSExchangeDataProviderWin::SetFileContents(
 void OSExchangeDataProviderWin::SetHtml(const base::string16& html,
                                         const GURL& base_url) {
   // Add both MS CF_HTML and text/html format.  CF_HTML should be in utf-8.
-  std::string utf8_html = UTF16ToUTF8(html);
+  std::string utf8_html = base::UTF16ToUTF8(html);
   std::string url = base_url.is_valid() ? base_url.spec() : std::string();
 
   std::string cf_html = ClipboardUtil::HtmlToCFHtml(utf8_html, url);
diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc
index 81f33c8..54ac7cd 100644
--- a/ui/base/dragdrop/os_exchange_data_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_unittest.cc
@@ -19,7 +19,7 @@ class OSExchangeDataTest : public PlatformTest {
 
 TEST_F(OSExchangeDataTest, StringDataGetAndSet) {
   OSExchangeData data;
-  base::string16 input = ASCIIToUTF16("I can has cheezburger?");
+  base::string16 input = base::ASCIIToUTF16("I can has cheezburger?");
   data.SetString(input);
 
   OSExchangeData data2(data.provider().Clone());
@@ -38,7 +38,7 @@ TEST_F(OSExchangeDataTest, TestURLExchangeFormats) {
   OSExchangeData data;
   std::string url_spec = "http://www.google.com/";
   GURL url(url_spec);
-  base::string16 url_title = ASCIIToUTF16("www.google.com");
+  base::string16 url_title = base::ASCIIToUTF16("www.google.com");
   data.SetURL(url, url_title);
   base::string16 output;
 
@@ -54,7 +54,7 @@ TEST_F(OSExchangeDataTest, TestURLExchangeFormats) {
 
   // URL should be the raw text response
   EXPECT_TRUE(data2.GetString(&output_string));
-  EXPECT_EQ(url_spec, UTF16ToUTF8(output_string));
+  EXPECT_EQ(url_spec, base::UTF16ToUTF8(output_string));
 }
 
 TEST_F(OSExchangeDataTest, TestPickledData) {
@@ -83,7 +83,7 @@ TEST_F(OSExchangeDataTest, TestPickledData) {
 TEST_F(OSExchangeDataTest, TestHTML) {
   OSExchangeData data;
   GURL url("http://www.google.com/");
-  base::string16 html = ASCIIToUTF16(
+  base::string16 html = base::ASCIIToUTF16(
       "<HTML>\n<BODY>\n"
       "<b>bold.</b> <i><b>This is bold italic.</b></i>\n"
       "</BODY>\n</HTML>");
diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
index 4202543..e73db84 100644
--- a/ui/base/dragdrop/os_exchange_data_win_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
@@ -136,7 +136,7 @@ TEST(OSExchangeDataWinTest, URLDataAccessViaCOM) {
   EXPECT_EQ(S_OK, com_data->GetData(&format_etc, &medium));
   std::wstring output =
       base::win::ScopedHGlobal<wchar_t>(medium.hGlobal).get();
-  EXPECT_EQ(url.spec(), WideToUTF8(output));
+  EXPECT_EQ(url.spec(), base::WideToUTF8(output));
   ReleaseStgMedium(&medium);
 }
 
@@ -163,7 +163,7 @@ TEST(OSExchangeDataWinTest, MultipleFormatsViaCOM) {
   EXPECT_EQ(S_OK, com_data->GetData(&url_format_etc, &medium));
   std::wstring output_url =
       base::win::ScopedHGlobal<wchar_t>(medium.hGlobal).get();
-  EXPECT_EQ(url.spec(), WideToUTF8(output_url));
+  EXPECT_EQ(url.spec(), base::WideToUTF8(output_url));
   ReleaseStgMedium(&medium);
 
   // The text is supposed to be the raw text of the URL, _NOT_ the value of
@@ -171,7 +171,7 @@ TEST(OSExchangeDataWinTest, MultipleFormatsViaCOM) {
   EXPECT_EQ(S_OK, com_data->GetData(&text_format_etc, &medium));
   std::wstring output_text =
       base::win::ScopedHGlobal<wchar_t>(medium.hGlobal).get();
-  EXPECT_EQ(url_spec, WideToUTF8(output_text));
+  EXPECT_EQ(url_spec, base::WideToUTF8(output_text));
   ReleaseStgMedium(&medium);
 }
 
@@ -321,7 +321,7 @@ TEST(OSExchangeDataWinTest, CFHtml) {
       "StartFragment:0000000175\r\nEndFragment:0000000252\r\n"
       "SourceURL:http://www.google.com/\r\n<html>\r\n<body>\r\n"
       "<!--StartFragment-->");
-  expected_cf_html += WideToUTF8(html);
+  expected_cf_html += base::WideToUTF8(html);
   expected_cf_html.append("<!--EndFragment-->\r\n</body>\r\n</html>");
 
   FORMATETC format = Clipboard::GetHtmlFormatType().ToFormatEtc();
diff --git a/ui/base/ime/chromeos/character_composer.cc b/ui/base/ime/chromeos/character_composer.cc
index ed1df4c..9155b73 100644
--- a/ui/base/ime/chromeos/character_composer.cc
+++ b/ui/base/ime/chromeos/character_composer.cc
@@ -561,7 +561,7 @@ void CharacterComposer::UpdatePreeditStringHexMode() {
     DCHECK(0 <= digit && digit < 16);
     preedit_string_ascii += digit <= 9 ? ('0' + digit) : ('a' + (digit - 10));
   }
-  preedit_string_ = ASCIIToUTF16(preedit_string_ascii);
+  preedit_string_ = base::ASCIIToUTF16(preedit_string_ascii);
 }
 
 }  // namespace ui
diff --git a/ui/base/ime/chromeos/character_composer_unittest.cc b/ui/base/ime/chromeos/character_composer_unittest.cc
index eb3a726..6853a1d 100644
--- a/ui/base/ime/chromeos/character_composer_unittest.cc
+++ b/ui/base/ime/chromeos/character_composer_unittest.cc
@@ -10,6 +10,8 @@
 #include "ui/base/glib/glib_integers.h"
 #include "ui/events/event_constants.h"
 
+using base::ASCIIToUTF16;
+
 namespace ui {
 
 class CharacterComposerTest : public testing::Test {
diff --git a/ui/base/ime/composition_text_util_pango.cc b/ui/base/ime/composition_text_util_pango.cc
index 737380b..98dadb6 100644
--- a/ui/base/ime/composition_text_util_pango.cc
+++ b/ui/base/ime/composition_text_util_pango.cc
@@ -19,7 +19,7 @@ void ExtractCompositionTextFromGtkPreedit(const gchar* utf8_text,
                                           int cursor_position,
                                           CompositionText* composition) {
   composition->Clear();
-  composition->text = UTF8ToUTF16(utf8_text);
+  composition->text = base::UTF8ToUTF16(utf8_text);
 
   if (composition->text.empty())
     return;
diff --git a/ui/base/ime/input_method_ibus.cc b/ui/base/ime/input_method_ibus.cc
index 0639641..3c55501 100644
--- a/ui/base/ime/input_method_ibus.cc
+++ b/ui/base/ime/input_method_ibus.cc
@@ -205,7 +205,7 @@ void InputMethodIBus::OnCaretBoundsChanged(const TextInputClient* client) {
   // |surrounding_text| coordinates.
   if (!GetEngine())
     return;
-  GetEngine()->SetSurroundingText(UTF16ToUTF8(surrounding_text),
+  GetEngine()->SetSurroundingText(base::UTF16ToUTF8(surrounding_text),
                                   selection_range.start() - text_range.start(),
                                   selection_range.end() - text_range.start());
 }
@@ -464,7 +464,7 @@ void InputMethodIBus::CommitText(const std::string& text) {
   if (!GetTextInputClient())
     return;
 
-  const base::string16 utf16_text = UTF8ToUTF16(text);
+  const base::string16 utf16_text = base::UTF8ToUTF16(text);
   if (utf16_text.empty())
     return;
 
@@ -552,11 +552,11 @@ bool InputMethodIBus::ExecuteCharacterComposer(const ui::KeyEvent& event) {
 
   chromeos::IBusText preedit;
   preedit.set_text(
-      UTF16ToUTF8(character_composer_.preedit_string()));
+      base::UTF16ToUTF8(character_composer_.preedit_string()));
   UpdatePreeditText(preedit, preedit.text().size(),
                     !preedit.text().empty());
    std::string commit_text =
-      UTF16ToUTF8(character_composer_.composed_character());
+      base::UTF16ToUTF8(character_composer_.composed_character());
   if (!commit_text.empty()) {
     CommitText(commit_text);
   }
@@ -568,7 +568,7 @@ void InputMethodIBus::ExtractCompositionText(
     uint32 cursor_position,
     CompositionText* out_composition) const {
   out_composition->Clear();
-  out_composition->text = UTF8ToUTF16(text.text());
+  out_composition->text = base::UTF8ToUTF16(text.text());
 
   if (out_composition->text.empty())
     return;
diff --git a/ui/base/ime/input_method_ibus_unittest.cc b/ui/base/ime/input_method_ibus_unittest.cc
index 49e5a40..2c204f9 100644
--- a/ui/base/ime/input_method_ibus_unittest.cc
+++ b/ui/base/ime/input_method_ibus_unittest.cc
@@ -26,6 +26,9 @@
 #include "ui/events/test/events_test_utils_x11.h"
 #include "ui/gfx/rect.h"
 
+using base::UTF8ToUTF16;
+using base::UTF16ToUTF8;
+
 namespace ui {
 namespace {
 typedef chromeos::IBusEngineHandlerInterface::KeyEventDoneCallback
diff --git a/ui/base/ime/remote_input_method_win.cc b/ui/base/ime/remote_input_method_win.cc
index f11d735..fd86059 100644
--- a/ui/base/ime/remote_input_method_win.cc
+++ b/ui/base/ime/remote_input_method_win.cc
@@ -61,7 +61,7 @@ std::string GetLocaleString(LCID Locale_id, LCTYPE locale_type) {
   if (chars_written <= 1 || arraysize(buffer) < chars_written)
     return std::string();
   std::string result;
-  WideToUTF8(buffer, chars_written - 1, &result);
+  base::WideToUTF8(buffer, chars_written - 1, &result);
   return result;
 }
 
diff --git a/ui/base/ime/win/imm32_manager.cc b/ui/base/ime/win/imm32_manager.cc
index 01eb18c..6cb0a32 100644
--- a/ui/base/ime/win/imm32_manager.cc
+++ b/ui/base/ime/win/imm32_manager.cc
@@ -487,7 +487,7 @@ std::string IMM32Manager::GetInputLanguageName() const {
     return std::string();
 
   std::string language;
-  WideToUTF8(buffer, length - 1, &language);
+  base::WideToUTF8(buffer, length - 1, &language);
   if (SUBLANGID(input_language_id_) == SUBLANG_NEUTRAL)
     return language;
 
@@ -498,7 +498,7 @@ std::string IMM32Manager::GetInputLanguageName() const {
     return language;
 
   std::string region;
-  WideToUTF8(buffer, length - 1, &region);
+  base::WideToUTF8(buffer, length - 1, &region);
   return language.append(1, '-').append(region);
 }
 
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc
index b610e96..d3fb160 100644
--- a/ui/base/l10n/l10n_util.cc
+++ b/ui/base/l10n/l10n_util.cc
@@ -225,7 +225,7 @@ bool IsLocalePartiallyPopulated(const std::string& locale_name) {
 bool IsLocaleAvailable(const std::string& locale) {
   // If locale has any illegal characters in it, we don't want to try to
   // load it because it may be pointing outside the locale data file directory.
-  if (!file_util::IsFilenameLegal(ASCIIToUTF16(locale)))
+  if (!file_util::IsFilenameLegal(base::ASCIIToUTF16(locale)))
     return false;
 
   // IsLocalePartiallyPopulated() can be called here for an early return w/o
@@ -661,7 +661,7 @@ bool IsValidLocaleSyntax(const std::string& locale) {
 }
 
 std::string GetStringUTF8(int message_id) {
-  return UTF16ToUTF8(GetStringUTF16(message_id));
+  return base::UTF16ToUTF8(GetStringUTF16(message_id));
 }
 
 base::string16 GetStringUTF16(int message_id) {
@@ -688,7 +688,7 @@ base::string16 GetStringFUTF16(int message_id,
   // check as the code may simply want to find the placeholders rather than
   // actually replacing them.
   if (!offsets) {
-    std::string utf8_string = UTF16ToUTF8(format_string);
+    std::string utf8_string = base::UTF16ToUTF8(format_string);
 
     // $9 is the highest allowed placeholder.
     for (size_t i = 0; i < 9; ++i) {
@@ -719,20 +719,20 @@ base::string16 GetStringFUTF16(int message_id,
 
 std::string GetStringFUTF8(int message_id,
                            const base::string16& a) {
-  return UTF16ToUTF8(GetStringFUTF16(message_id, a));
+  return base::UTF16ToUTF8(GetStringFUTF16(message_id, a));
 }
 
 std::string GetStringFUTF8(int message_id,
                            const base::string16& a,
                            const base::string16& b) {
-  return UTF16ToUTF8(GetStringFUTF16(message_id, a, b));
+  return base::UTF16ToUTF8(GetStringFUTF16(message_id, a, b));
 }
 
 std::string GetStringFUTF8(int message_id,
                            const base::string16& a,
                            const base::string16& b,
                            const base::string16& c) {
-  return UTF16ToUTF8(GetStringFUTF16(message_id, a, b, c));
+  return base::UTF16ToUTF8(GetStringFUTF16(message_id, a, b, c));
 }
 
 std::string GetStringFUTF8(int message_id,
@@ -740,7 +740,7 @@ std::string GetStringFUTF8(int message_id,
                            const base::string16& b,
                            const base::string16& c,
                            const base::string16& d) {
-  return UTF16ToUTF8(GetStringFUTF16(message_id, a, b, c, d));
+  return base::UTF16ToUTF8(GetStringFUTF16(message_id, a, b, c, d));
 }
 
 base::string16 GetStringFUTF16(int message_id,
@@ -819,11 +819,11 @@ base::string16 GetStringFUTF16(int message_id,
 }
 
 base::string16 GetStringFUTF16Int(int message_id, int a) {
-  return GetStringFUTF16(message_id, UTF8ToUTF16(base::IntToString(a)));
+  return GetStringFUTF16(message_id, base::UTF8ToUTF16(base::IntToString(a)));
 }
 
 base::string16 GetStringFUTF16Int(int message_id, int64 a) {
-  return GetStringFUTF16(message_id, UTF8ToUTF16(base::Int64ToString(a)));
+  return GetStringFUTF16(message_id, base::UTF8ToUTF16(base::Int64ToString(a)));
 }
 
 // Specialization of operator() method for base::string16 version.
diff --git a/ui/base/l10n/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc
index ef530fa..a19563b 100644
--- a/ui/base/l10n/l10n_util_unittest.cc
+++ b/ui/base/l10n/l10n_util_unittest.cc
@@ -33,6 +33,9 @@
 #include "ui/base/test/data/resource.h"
 #endif
 
+using base::ASCIIToUTF16;
+using base::UTF8ToUTF16;
+
 namespace {
 
 class StringWrapper {
diff --git a/ui/base/l10n/time_format_unittest.cc b/ui/base/l10n/time_format_unittest.cc
index 483538f..6f6acc4 100644
--- a/ui/base/l10n/time_format_unittest.cc
+++ b/ui/base/l10n/time_format_unittest.cc
@@ -10,6 +10,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using base::ASCIIToUTF16;
+
 namespace ui {
 namespace {
 
diff --git a/ui/base/models/tree_node_model_unittest.cc b/ui/base/models/tree_node_model_unittest.cc
index 48f71b9..d9d387c 100644
--- a/ui/base/models/tree_node_model_unittest.cc
+++ b/ui/base/models/tree_node_model_unittest.cc
@@ -12,6 +12,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using base::ASCIIToUTF16;
+
 namespace ui {
 
 class TreeNodeModelTest : public testing::Test, public TreeModelObserver {
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index b5f8f61..22f191c 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -481,7 +481,7 @@ base::string16 ResourceBundle::GetLocalizedString(int message_id) {
     msg = base::string16(reinterpret_cast<const base::char16*>(data.data()),
                          data.length() / 2);
   } else if (encoding == ResourceHandle::UTF8) {
-    msg = UTF8ToUTF16(data);
+    msg = base::UTF8ToUTF16(data);
   }
   return msg;
 }
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index 28c5b02..4213507 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -298,7 +298,7 @@ TEST_F(ResourceBundleTest, DelegateGetLocalizedString) {
   MockResourceBundleDelegate delegate;
   ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
-  base::string16 data = ASCIIToUTF16("My test data");
+  base::string16 data = base::ASCIIToUTF16("My test data");
   int resource_id = 5;
 
   EXPECT_CALL(delegate, GetLocalizedStringMock(resource_id))
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index cb99e20..df058e6 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -30,7 +30,7 @@ base::FilePath GetResourcesPakFilePath(const std::string& pak_name) {
     return path.AppendASCII(pak_name.c_str());
 
   // Return just the name of the pack file.
-  return base::FilePath(ASCIIToUTF16(pak_name));
+  return base::FilePath(base::ASCIIToUTF16(pak_name));
 }
 
 }  // namespace
diff --git a/ui/base/text/bytes_formatting_unittest.cc b/ui/base/text/bytes_formatting_unittest.cc
index 357abc7..b2a03f9 100644
--- a/ui/base/text/bytes_formatting_unittest.cc
+++ b/ui/base/text/bytes_formatting_unittest.cc
@@ -69,9 +69,9 @@ TEST(BytesFormattingTest, FormatBytes) {
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
-    EXPECT_EQ(ASCIIToUTF16(cases[i].expected),
+    EXPECT_EQ(base::ASCIIToUTF16(cases[i].expected),
               FormatBytesWithUnits(cases[i].bytes, cases[i].units, false));
-    EXPECT_EQ(ASCIIToUTF16(cases[i].expected_with_units),
+    EXPECT_EQ(base::ASCIIToUTF16(cases[i].expected_with_units),
               FormatBytesWithUnits(cases[i].bytes, cases[i].units, true));
   }
 }
diff --git a/ui/base/x/selection_utils.cc b/ui/base/x/selection_utils.cc
index 138745b..5b501ec 100644
--- a/ui/base/x/selection_utils.cc
+++ b/ui/base/x/selection_utils.cc
@@ -205,7 +205,7 @@ base::string16 SelectionData::GetHtml() const {
       markup.assign(reinterpret_cast<const uint16_t*>(data) + 1,
                     (size / 2) - 1);
     } else {
-      UTF8ToUTF16(reinterpret_cast<const char*>(data), size, &markup);
+      base::UTF8ToUTF16(reinterpret_cast<const char*>(data), size, &markup);
     }
 
     // If there is a terminating NULL, drop it.