Revert 104076 - Change std::wstring to string16 for views::Link

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.cc	(revision 104083)
+++ chrome/browser/ui/views/location_bar/location_bar_view.cc	(working copy)
@@ -8,9 +8,6 @@
 #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"
@@ -443,7 +440,7 @@
         suggested_text_view_->SetFont(GetOmniboxViewWin()->GetFont());
 #endif
       AddChildView(suggested_text_view_);
-    } else if (suggested_text_view_->GetText() != text) {
+    } else if (suggested_text_view_->GetText() != UTF16ToWide(text)) {
       suggested_text_view_->SetText(UTF16ToWide(text));
     }
     if (animate_to_complete && !location_entry_->IsImeComposing())
@@ -513,7 +510,7 @@
     entry_width -= (kEdgeThickness + kEdgeEditPadding);
   } else if (model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
     ev_bubble_view_->SetVisible(true);
-    ev_bubble_view_->SetLabel(model_->GetEVCertName());
+    ev_bubble_view_->SetLabel(UTF16ToWideHack(model_->GetEVCertName()));
     ev_bubble_width = ev_bubble_view_->GetPreferredSize().width();
     // We'll adjust this width and take it out of |entry_width| below.
   } else {