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

chrome/browser/ui/views/location_bar/location_bar_view.cc

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 66fefaab9a2d224312350cb27cf4f191d6b1e7f2..b497124781606e3af998854d38d38501a2d77f87 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -8,6 +8,9 @@
 #include <gtk/gtk.h>
 #endif
 
+#include <algorithm>
+#include <map>
+
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ -440,7 +443,7 @@ void LocationBarView::SetInstantSuggestion(const string16& text,
         suggested_text_view_->SetFont(GetOmniboxViewWin()->GetFont());
 #endif
       AddChildView(suggested_text_view_);
-    } else if (suggested_text_view_->GetText() != UTF16ToWide(text)) {
+    } else if (suggested_text_view_->GetText() != text) {
       suggested_text_view_->SetText(UTF16ToWide(text));
     }
     if (animate_to_complete && !location_entry_->IsImeComposing())
@@ -510,7 +513,7 @@ void LocationBarView::Layout() {
     entry_width -= (kEdgeThickness + kEdgeEditPadding);
   } else if (model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
     ev_bubble_view_->SetVisible(true);
-    ev_bubble_view_->SetLabel(UTF16ToWideHack(model_->GetEVCertName()));
+    ev_bubble_view_->SetLabel(model_->GetEVCertName());
     ev_bubble_width = ev_bubble_view_->GetPreferredSize().width();
     // We'll adjust this width and take it out of |entry_width| below.
   } else {