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

chrome/browser/ui/views/find_bar_view.cc

Index: chrome/browser/ui/views/find_bar_view.cc
diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc
index aba15334e58e6b16cf2c95b85582f0bcfad113ee..9152f287c33850a1e10ba39cdbf0d67458ef6f58 100644
--- a/chrome/browser/ui/views/find_bar_view.cc
+++ b/chrome/browser/ui/views/find_bar_view.cc
@@ -167,7 +167,7 @@ string16 FindBarView::GetFindSelectedText() const {
 }
 
 string16 FindBarView::GetMatchCountText() const {
-  return WideToUTF16Hack(match_count_text_->GetText());
+  return match_count_text_->GetText();
 }
 
 void FindBarView::UpdateForResult(const FindNotificationDetails& result,
@@ -184,17 +184,17 @@ void FindBarView::UpdateForResult(const FindNotificationDetails& result,
   }
 
   if (!find_text.empty() && have_valid_range) {
-    match_count_text_->SetText(UTF16ToWide(
+    match_count_text_->SetText(
         l10n_util::GetStringFUTF16(IDS_FIND_IN_PAGE_COUNT,
             base::IntToString16(result.active_match_ordinal()),
-            base::IntToString16(result.number_of_matches()))));
+            base::IntToString16(result.number_of_matches())));
 
     UpdateMatchCountAppearance(result.number_of_matches() == 0 &&
                                result.final_update());
   } else {
     // If there was no text entered, we don't show anything in the result count
     // area.
-    match_count_text_->SetText(std::wstring());
+    match_count_text_->SetText(string16());
 
     UpdateMatchCountAppearance(false);
   }
@@ -207,7 +207,7 @@ void FindBarView::UpdateForResult(const FindNotificationDetails& result,
 }
 
 void FindBarView::ClearMatchCount() {
-  match_count_text_->SetText(L"");
+  match_count_text_->SetText(string16());
   UpdateMatchCountAppearance(false);
   Layout();
   SchedulePaint();