Remove wstring from views. Part 3: Switch accessibility strings to string16....

views/window/custom_frame_view.cc

Index: views/window/custom_frame_view.cc
===================================================================
--- views/window/custom_frame_view.cc	(revision 71358)
+++ views/window/custom_frame_view.cc	(working copy)
@@ -78,13 +78,13 @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   close_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE)));
+      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
 
   // Close button images will be set in LayoutWindowControls().
   AddChildView(close_button_);
 
   restore_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCNAME_RESTORE)));
+      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_RESTORE));
   restore_button_->SetImage(CustomButton::BS_NORMAL,
                             rb.GetBitmapNamed(IDR_RESTORE));
   restore_button_->SetImage(CustomButton::BS_HOT,
@@ -94,7 +94,7 @@
   AddChildView(restore_button_);
 
   maximize_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE)));
+      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MAXIMIZE));
   maximize_button_->SetImage(CustomButton::BS_NORMAL,
                              rb.GetBitmapNamed(IDR_MAXIMIZE));
   maximize_button_->SetImage(CustomButton::BS_HOT,
@@ -104,7 +104,7 @@
   AddChildView(maximize_button_);
 
   minimize_button_->SetAccessibleName(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE)));
+      l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE));
   minimize_button_->SetImage(CustomButton::BS_NORMAL,
                              rb.GetBitmapNamed(IDR_MINIMIZE));
   minimize_button_->SetImage(CustomButton::BS_HOT,