Remove wstring from gfx.

views/controls/button/text_button.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 "views/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/logging.h"
@@ skipping 342 matching lines @@
 
     if (for_drag) {
 #if defined(OS_WIN)
       // TODO(erg): Either port DrawStringWithHalo to linux or find an
       // alternative here.
       canvas->AsCanvasSkia()->DrawStringWithHalo(
           text_, font_, text_color, color_highlight_, text_bounds.x(),
           text_bounds.y(), text_bounds.width(), text_bounds.height(),
           draw_string_flags);
 #else
-      canvas->DrawStringInt(UTF16ToWideHack(text_),
+      canvas->DrawStringInt(text_,
                             font_,
                             text_color,
                             text_bounds.x(),
                             text_bounds.y(),
                             text_bounds.width(),
                             text_bounds.height(),
                             draw_string_flags);
 #endif
     } else if (has_text_halo_) {
       canvas->AsCanvasSkia()->DrawStringWithHalo(
-          UTF16ToWideHack(text_), font_, text_color, text_halo_color_,
+          text_, font_, text_color, text_halo_color_,
           text_bounds.x(), text_bounds.y(), text_bounds.width(),
           text_bounds.height(), draw_string_flags);
     } else {
-      canvas->DrawStringInt(UTF16ToWideHack(text_),
+      canvas->DrawStringInt(text_,
                             font_,
                             text_color,
                             text_bounds.x(),
                             text_bounds.y(),
                             text_bounds.width(),
                             text_bounds.height(),
                             draw_string_flags);
     }
   }
 
@@ skipping 66 matching lines @@
 
 std::string TextButton::GetClassName() const {
   return kViewClassName;
 }
 
 void TextButton::Paint(gfx::Canvas* canvas) {
   Paint(canvas, false);
 }
 
 }  // namespace views