Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/chromeos/login/message_bubble.cc

Index: chrome/browser/chromeos/login/message_bubble.cc
===================================================================
--- chrome/browser/chromeos/login/message_bubble.cc	(revision 104083)
+++ chrome/browser/chromeos/login/message_bubble.cc	(working copy)
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
@@ -63,7 +62,7 @@
   icon_->SetImage(*image);
   layout->AddView(icon_);
 
-  text_ = new views::Label(WideToUTF16Hack(text));
+  text_ = new views::Label(text);
   text_->SetMultiLine(true);
   text_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   text_->SizeToFit(kMaxLabelWidth);
@@ -80,7 +79,7 @@
 
   for (size_t i = 0; i < links.size(); ++i) {
     layout->StartRowWithPadding(0, 1, 0, kBorderSize);
-    views::Link* help_link_ = new views::Link(WideToUTF16Hack(links[i]));
+    views::Link* help_link_ = new views::Link(links[i]);
     help_links_.push_back(help_link_);
     help_link_->set_listener(this);
     help_link_->SetNormalColor(login::kLinkColor);