Revert 71167 - Remove wstring from gfx....

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

 // Copyright (c) 2010 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/content_setting_image_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 165 matching lines @@
         saved_insets_.left() + necessary_left_margin,
         saved_insets_.bottom(),
         saved_insets_.right());
     set_border(empty_border);
   }
   // Paint an icon with possibly non-empty left border.
   views::ImageView::Paint(canvas);
   if (animation_in_progress_) {
     // Paint text to the right of the icon.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    canvas->DrawStringInt(animated_text_,
+    canvas->DrawStringInt(UTF16ToWideHack(animated_text_),
         rb.GetFont(ResourceBundle::MediumFont), SK_ColorBLACK,
         GetImageBounds().right() + kTextMarginPixels, y(),
         width() - GetImageBounds().width(), height(),
         gfx::Canvas::TEXT_ALIGN_LEFT | gfx::Canvas::TEXT_VALIGN_MIDDLE);
   }
 }
 
 void ContentSettingImageView::PaintBackground(gfx::Canvas* canvas) {
   if (!animation_in_progress_) {
     views::ImageView::PaintBackground(canvas);
@@ skipping 38 matching lines @@
   } else if (state > (1.0 - kAnimatingFraction)) {
     visible_text_size_ = static_cast<int>(text_size_ * (1.0 - state) /
                                           kAnimatingFraction);
   } else {
     visible_text_size_ = text_size_;
   }
   parent_->Layout();
   parent_->SchedulePaint();
 }