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

ui/app_list/cocoa/app_list_window_controller_unittest.mm

@@ -81,7 +81,7 @@
 
   EXPECT_FALSE([view_controller showingSearchResults]);
 
-  const base::string16 search_text(ASCIIToUTF16("test"));
+  const base::string16 search_text(base::ASCIIToUTF16("test"));
   model->SetText(search_text);
   EXPECT_TRUE([view_controller showingSearchResults]);
 

ui/app_list/cocoa/apps_grid_controller_unittest.mm

@@ -138,7 +138,7 @@ explicit AppListItemWithMenu(const std::string& title)
         menu_model_(NULL),
         menu_ready_(true) {
     SetTitleAndFullName(title, title);
-    menu_model_.AddItem(0, UTF8ToUTF16("Menu For: " + title));
+    menu_model_.AddItem(0, base::UTF8ToUTF16("Menu For: " + title));
   }
 
   void SetMenuReadyForTesting(bool ready) {

ui/app_list/cocoa/apps_search_box_controller_unittest.mm

@@ -16,6 +16,8 @@
 #import "ui/base/cocoa/menu_controller.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
+using base::ASCIIToUTF16;
+
 @interface TestAppsSearchBoxDelegate : NSObject<AppsSearchBoxDelegate> {
  @private
   app_list::SearchBoxModel searchBoxModel_;

ui/app_list/cocoa/apps_search_results_controller_unittest.mm

@@ -65,9 +65,9 @@ - (void)quitMessageLoop {
   SearchResultWithMenu(const std::string& title, const std::string& details)
       : menu_model_(NULL),
         menu_ready_(true) {
-    set_title(ASCIIToUTF16(title));
-    set_details(ASCIIToUTF16(details));
-    menu_model_.AddItem(0, UTF8ToUTF16("Menu For: " + title));
+    set_title(base::ASCIIToUTF16(title));
+    set_details(base::ASCIIToUTF16(details));
+    menu_model_.AddItem(0, base::UTF8ToUTF16("Menu For: " + title));
   }
 
   void SetMenuReadyForTesting(bool ready) {
@@ -146,7 +146,7 @@ BOOL SimulateKeyAction(SEL c) {
     SearchResult* result = ModelResultAt(i);
     base::string16 string_in_model = result->title();
     if (!result->details().empty())
-      string_in_model += ASCIIToUTF16("\n") + result->details();
+      string_in_model += base::ASCIIToUTF16("\n") + result->details();
     EXPECT_NSEQ(base::SysUTF16ToNSString(string_in_model),
                 [[ViewResultAt(i) attributedStringValue] string]);
   }

ui/app_list/cocoa/signin_view_controller_unittest.mm

@@ -37,7 +37,7 @@
                                  public SigninDelegate {
  public:
   SigninViewControllerTest()
-      : test_text_(ASCIIToUTF16("Sign in")),
+      : test_text_(base::ASCIIToUTF16("Sign in")),
         needs_signin_(true),
         show_signin_count_(0),
         open_learn_more_count_(0),

ui/app_list/views/app_list_item_view.cc

@@ -134,7 +134,7 @@ void AppListItemView::UpdateIcon() {
 
 void AppListItemView::UpdateTooltip() {
   title_->SetTooltipText(model_->title() == model_->full_name() ?
-      base::string16() : UTF8ToUTF16(model_->full_name()));
+      base::string16() : base::UTF8ToUTF16(model_->full_name()));
 }
 
 void AppListItemView::SetUIState(UIState state) {
@@ -226,7 +226,7 @@ void AppListItemView::ItemIconChanged() {
 }
 
 void AppListItemView::ItemTitleChanged() {
-  title_->SetText(UTF8ToUTF16(model_->title()));
+  title_->SetText(base::UTF8ToUTF16(model_->title()));
   title_->Invalidate();
   UpdateTooltip();
   Layout();
@@ -317,7 +317,7 @@ void AppListItemView::OnPaint(gfx::Canvas* canvas) {
 
 void AppListItemView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
-  state->name = UTF8ToUTF16(model_->title());
+  state->name = base::UTF8ToUTF16(model_->title());
 }
 
 void AppListItemView::ShowContextMenuForView(views::View* source,

ui/app_list/views/apps_grid_view_unittest.cc

@@ -441,8 +441,8 @@ TEST_F(AppsGridViewTest, ItemLabelShortNameOverride) {
   const views::Label* title_label = item_view->title();
   EXPECT_TRUE(title_label->GetTooltipText(
       title_label->bounds().CenterPoint(), &actual_tooltip));
-  EXPECT_EQ(expected_tooltip, UTF16ToUTF8(actual_tooltip));
-  EXPECT_EQ(expected_text, UTF16ToUTF8(title_label->text()));
+  EXPECT_EQ(expected_tooltip, base::UTF16ToUTF8(actual_tooltip));
+  EXPECT_EQ(expected_text, base::UTF16ToUTF8(title_label->text()));
 }
 
 TEST_F(AppsGridViewTest, ItemLabelNoShortName) {
@@ -457,7 +457,7 @@ TEST_F(AppsGridViewTest, ItemLabelNoShortName) {
   const views::Label* title_label = item_view->title();
   EXPECT_FALSE(title_label->GetTooltipText(
       title_label->bounds().CenterPoint(), &actual_tooltip));
-  EXPECT_EQ(title, UTF16ToUTF8(title_label->text()));
+  EXPECT_EQ(title, base::UTF16ToUTF8(title_label->text()));
 }
 
 }  // namespace test

ui/app_list/views/folder_header_view.cc

@@ -99,7 +99,7 @@ void FolderHeaderView::Update() {
   if (!folder_item_)
     return;
 
-  folder_name_view_->SetText(UTF8ToUTF16(folder_item_->title()));
+  folder_name_view_->SetText(base::UTF8ToUTF16(folder_item_->title()));
 }
 
 gfx::Size FolderHeaderView::GetPreferredSize() {
@@ -146,7 +146,7 @@ void FolderHeaderView::ContentsChanged(views::Textfield* sender,
     return;
 
   folder_item_->RemoveObserver(this);
-  std::string name = UTF16ToUTF8(folder_name_view_->text());
+  std::string name = base::UTF16ToUTF8(folder_name_view_->text());
   folder_item_->SetTitleAndFullName(name, name);
   folder_item_->AddObserver(this);
 }

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);

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());

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()) {

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);

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.

ui/base/clipboard/clipboard_mac.mm

@@ -228,13 +228,13 @@
   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 @@
   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 @@
     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 @@
 
   if (title) {
     NSString* contents = [pb stringForType:kUTTypeURLName];
-    UTF8ToUTF16([contents UTF8String],
-                [contents lengthOfBytesUsingEncoding:NSUTF8StringEncoding],
-                title);
+    *title = base::SysNSStringToUTF16(contents);
   }
 
   if (url) {

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 {

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;