Change std::wstring to string16 for views::Label and views::Link

views/controls/message_box_view.cc

Index: views/controls/message_box_view.cc
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc
index cd51b67a0cc4bde3b78bb1e6f5c2a751193d8e14..a11edbdf4396a21f7e735748b15ea23b9b2cb5bf 100644
--- a/views/controls/message_box_view.cc
+++ b/views/controls/message_box_view.cc
@@ -32,7 +32,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
                                const std::wstring& message,
                                const std::wstring& default_prompt,
                                int message_width)
-    : message_label_(new Label(message)),
+    : message_label_(new Label(WideToUTF16Hack(message))),
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
@@ -43,7 +43,7 @@ MessageBoxView::MessageBoxView(int dialog_flags,
 MessageBoxView::MessageBoxView(int dialog_flags,
                                const std::wstring& message,
                                const std::wstring& default_prompt)
-    : message_label_(new Label(message)),
+    : message_label_(new Label(WideToUTF16Hack(message))),
       prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
@@ -119,7 +119,7 @@ bool MessageBoxView::AcceleratorPressed(
     return false;
 
   ui::ScopedClipboardWriter scw(clipboard);
-  scw.WriteText(WideToUTF16Hack(message_label_->GetText()));
+  scw.WriteText(message_label_->GetText());
   return true;
 }
 
@@ -135,7 +135,7 @@ void MessageBoxView::Init(int dialog_flags,
     // with strong directionality.
     base::i18n::TextDirection direction =
         base::i18n::GetFirstStrongCharacterDirection(
-            WideToUTF16(message_label_->GetText()));
+            message_label_->GetText());
     Label::Alignment alignment;
     if (direction == base::i18n::RIGHT_TO_LEFT)
       alignment = Label::ALIGN_RIGHT;