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

chrome/browser/chromeos/login/user_image_view.cc

Index: chrome/browser/chromeos/login/user_image_view.cc
diff --git a/chrome/browser/chromeos/login/user_image_view.cc b/chrome/browser/chromeos/login/user_image_view.cc
index 43df7bac0288d6ecaa9e007fb3a51322000d7f44..9bfda9d76ff48de05e691608cc784990a5e9b626 100644
--- a/chrome/browser/chromeos/login/user_image_view.cc
+++ b/chrome/browser/chromeos/login/user_image_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/login/user_image_view.h"
 
+#include <string>
+
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/default_images_view.h"
@@ -47,7 +49,7 @@ const int kSplitterHeight = 1;
 enum ColumnSets {
   kTitleRow,     // Column set for screen title.
   kImagesRow,    // Column set for image from camera and snapshot button.
-  kSplitterRow, // Place for the splitter.
+  kSplitterRow,  // Place for the splitter.
   kButtonsRow,   // Column set for OK button.
 };
 
@@ -80,8 +82,8 @@ void UserImageView::Init() {
       &BorderDefinition::kScreenBorder);
   set_background(views::Background::CreateBackgroundPainter(true, painter));
 
-  title_label_ = new views::Label(UTF16ToWide(
-      l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT)));
+  title_label_ = new views::Label(
+      l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE_DIALOG_TEXT));
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   title_label_->SetMultiLine(true);
   CorrectLabelFontSize(title_label_);