Convert SizeStringInt from taking a wstring to a string16.

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/throb_animation.h"
 #include "app/resource_bundle.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "views/controls/button/button.h"
 #include "views/event.h"
 #include "grit/app_resources.h"
 
 namespace views {
 
 // Default space between the icon and text.
 static const int kDefaultIconTextSpacing = 5;
 
@@ skipping 373 matching lines @@
   }
 }
 
 void TextButton::UpdateColor() {
   color_ = IsEnabled() ? color_enabled_ : color_disabled_;
 }
 
 void TextButton::UpdateTextSize() {
   int width = 0, height = 0;
   gfx::CanvasSkia::SizeStringInt(
-      text_, font_, &width, &height,
+      WideToUTF16Hack(text_), font_, &width, &height,
       gfx::Canvas::NO_ELLIPSIS | PrefixTypeToCanvasType(prefix_type_));
 
   // Add 2 extra pixels to width and height when text halo is used.
   if (has_text_halo_) {
     width += 2;
     height += 2;
   }
 
   text_size_.SetSize(width, font_.GetHeight());
   max_text_size_.SetSize(std::max(max_text_size_.width(), text_size_.width()),
@@ skipping 38 matching lines @@
 
 std::string TextButton::GetClassName() const {
   return kViewClassName;
 }
 
 void TextButton::Paint(gfx::Canvas* canvas) {
   Paint(canvas, false);
 }
 
 }  // namespace views