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

chrome/browser/ui/views/infobars/infobar_view.cc

Index: chrome/browser/ui/views/infobars/infobar_view.cc
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index 6d8209caa8e8365ca4dd55d774f5b3d216441f52..5dcb4dfbcb6622a32d8901d8b5a1e87a6638ceea 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -4,6 +4,10 @@
 
 #include "chrome/browser/ui/views/infobars/infobar_view.h"
 
+#if defined(OS_WIN)
+#include <shellapi.h>
+#endif
+
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
@@ -33,8 +37,6 @@
 #include "views/window/non_client_view.h"
 
 #if defined(OS_WIN)
-#include <shellapi.h>
-
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "ui/base/win/hwnd_util.h"
@@ -76,7 +78,7 @@ InfoBarView::~InfoBarView() {
 
 // static
 views::Label* InfoBarView::CreateLabel(const string16& text) {
-  views::Label* label = new views::Label(UTF16ToWideHack(text),
+  views::Label* label = new views::Label(text,
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
   label->SetColor(SK_ColorBLACK);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
@@ -88,7 +90,7 @@ views::Link* InfoBarView::CreateLink(const string16& text,
                                      views::LinkListener* listener,
                                      const SkColor& background_color) {
   views::Link* link = new views::Link;
-  link->SetText(UTF16ToWideHack(text));
+  link->SetText(text);
   link->SetFont(
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
   link->SetHorizontalAlignment(views::Label::ALIGN_LEFT);