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

chrome/browser/chromeos/login/user_view.cc

Index: chrome/browser/chromeos/login/user_view.cc
diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc
index 8cca3fe006b358ff45d3660dd7d9cc74ed519e6b..78055025558b56088a00a4ef3acc31d998c8c5ef 100644
--- a/chrome/browser/chromeos/login/user_view.cc
+++ b/chrome/browser/chromeos/login/user_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/login/user_view.h"
 
+#include <algorithm>
+
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
@@ -72,12 +74,12 @@ class SignoutView : public views::View {
     const gfx::Font& font = rb.GetFont(ResourceBundle::SmallFont);
 
     active_user_label_ = new views::Label(
-        UTF16ToWide(l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_ACTIVE_USER)));
+        l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_ACTIVE_USER));
     active_user_label_->SetFont(font);
     active_user_label_->SetColor(kTextColor);
 
     signout_link_ = new views::Link(
-        UTF16ToWide(l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_SIGN_OUT)));
+        l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_SIGN_OUT));
     signout_link_->set_listener(link_listener);
     signout_link_->SetFont(font);
     signout_link_->SetColor(kTextColor);