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

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"
 
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 
 // Amount of padding at the edges of the bubble.
 static const int kBubbleOuterPadding = LocationBarView::kEdgeItemPadding -
     LocationBarView::kBubbleHorizontalPadding;
@@ skipping 15 matching lines @@
   label_->SetColor(color);
 }
 
 IconLabelBubbleView::~IconLabelBubbleView() {
 }
 
 void IconLabelBubbleView::SetFont(const gfx::Font& font) {
   label_->SetFont(font);
 }
 
-void IconLabelBubbleView::SetLabel(const string16& label) {
+void IconLabelBubbleView::SetLabel(const std::wstring& label) {
   label_->SetText(label);
 }
 
 void IconLabelBubbleView::SetImage(const SkBitmap& bitmap) {
   image_->SetImage(bitmap);
 }
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   background_painter_.Paint(width(), height(), canvas);
 }
@@ skipping 23 matching lines @@
 
 int IconLabelBubbleView::GetPreLabelWidth() const {
   return kBubbleOuterPadding + ResourceBundle::GetSharedInstance().
       GetBitmapNamed(IDR_OMNIBOX_SEARCH)->width() +
       LocationBarView::kItemPadding;
 }
 
 int IconLabelBubbleView::GetNonLabelWidth() const {
   return GetPreLabelWidth() + kBubbleOuterPadding;
 }