Revert 71167 - Remove wstring from gfx....

chrome/browser/ui/views/status_bubble_views.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/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
@@ skipping 429 matching lines @@
   body_bounds.set_x(MirroredLeftPointForRect(body_bounds));
   SkColor text_color =
       theme_provider_->GetColor(BrowserThemeProvider::COLOR_TAB_TEXT);
 
   // DrawStringInt doesn't handle alpha, so we'll do the blending ourselves.
   text_color = SkColorSetARGB(
       SkColorGetA(text_color),
       (SkColorGetR(text_color) + SkColorGetR(toolbar_color)) / 2,
       (SkColorGetG(text_color) + SkColorGetR(toolbar_color)) / 2,
       (SkColorGetB(text_color) + SkColorGetR(toolbar_color)) / 2);
-  canvas->DrawStringInt(text_,
+  canvas->DrawStringInt(UTF16ToWide(text_),
                         views::Label::font(),
                         text_color,
                         body_bounds.x(),
                         body_bounds.y(),
                         body_bounds.width(),
                         body_bounds.height());
 }
 
 // StatusViewExpander ---------------------------------------------------------
 // Manages the expansion and contraction of the status bubble as it accommodates
@@ skipping 367 matching lines @@
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(original_position_.x(), original_position_.y(),
             size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
   if (!expand_timer_factory_.empty())
     expand_timer_factory_.RevokeAll();
 }