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

chrome/browser/ui/views/page_info_bubble_view.cc

Index: chrome/browser/ui/views/page_info_bubble_view.cc
diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc
index 14124c154013102a2eba780a5c4fdd4af1506a9c..352b5a3bd3e4136d7f52939588a4db89c7bfc426 100644
--- a/chrome/browser/ui/views/page_info_bubble_view.cc
+++ b/chrome/browser/ui/views/page_info_bubble_view.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/views/page_info_bubble_view.h"
 
+#include <algorithm>
+
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/google/google_util.h"
@@ -222,7 +224,7 @@ void PageInfoBubbleView::LayoutSections() {
   if (!only_internal_section) {
     layout->StartRow(0, 1);
     help_center_link_ = new views::Link(
-        UTF16ToWide(l10n_util::GetStringUTF16(IDS_PAGE_INFO_HELP_CENTER_LINK)));
+        l10n_util::GetStringUTF16(IDS_PAGE_INFO_HELP_CENTER_LINK));
     help_center_link_->set_listener(this);
     layout->AddView(help_center_link_);
   }
@@ -362,7 +364,7 @@ Section::Section(PageInfoBubbleView* owner,
 
   // Can't make this a text field to enable copying until multiline support is
   // added to text fields.
-  description_label_ = new views::Label(UTF16ToWideHack(info_.description));
+  description_label_ = new views::Label(info_.description);
   description_label_->set_background(
       views::Background::CreateSolidBackground(SK_ColorWHITE));
   description_label_->SetMultiLine(true);
@@ -374,7 +376,7 @@ Section::Section(PageInfoBubbleView* owner,
 
   if (info_.type == PageInfoModel::SECTION_INFO_IDENTITY && show_cert) {
     link_ = new views::Link(
-        UTF16ToWide(l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON)));
+        l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON));
     link_->set_listener(this);
     AddChildView(link_);
   }
@@ -502,5 +504,4 @@ void ShowPageInfoBubble(BrowserView* browser_view,
                    page_info_bubble, page_info_bubble);
   page_info_bubble->set_bubble(bubble);
 }
-
 }