Move |PlatformFont::GetStringWidth()| implementation up into font.cc directly.

ui/gfx/platform_font_pango.cc

 // Copyright (c) 2012 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 "ui/gfx/platform_font_pango.h"
 
 #include <algorithm>
 #include <fontconfig/fontconfig.h>
 #include <map>
 #include <pango/pango.h>
@@ skipping 221 matching lines @@
 
 int PlatformFontPango::GetBaseline() const {
   return ascent_pixels_;
 }
 
 int PlatformFontPango::GetAverageCharacterWidth() const {
   const_cast<PlatformFontPango*>(this)->InitPangoMetrics();
   return SkScalarRound(average_width_pixels_);
 }
 
-int PlatformFontPango::GetStringWidth(const string16& text) const {
-  int width = 0, height = 0;
-  CanvasSkia::SizeStringInt(text, Font(const_cast<PlatformFontPango*>(this)),
-                            &width, &height, gfx::Canvas::NO_ELLIPSIS);
-  return width;
-}
-
 int PlatformFontPango::GetExpectedTextWidth(int length) const {
   double char_width = const_cast<PlatformFontPango*>(this)->GetAverageWidth();
   return round(static_cast<float>(length) * char_width);
 }
 
 int PlatformFontPango::GetStyle() const {
   return style_;
 }
 
 std::string PlatformFontPango::GetFontName() const {
@@ skipping 133 matching lines @@
     // TODO(davemoore): Come up with a better solution.
     // This is a hack, but without doing this the underlines
     // we get end up fuzzy. So we align to the midpoint of a pixel.
     underline_position_pixels_ /= 2;
 
     underline_thickness_pixels_ =
         pango_font_metrics_get_underline_thickness(pango_metrics) /
         PANGO_SCALE;
 
     // First get the Pango-based width (converting from Pango units to pixels).
-    double pango_width_pixels =
+    const double pango_width_pixels =
         pango_font_metrics_get_approximate_char_width(pango_metrics) /
         PANGO_SCALE;
 
     // Yes, this is how Microsoft recommends calculating the dialog unit
     // conversions.
-    int text_width_pixels = GetStringWidth(
-        ASCIIToUTF16("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
-    double dialog_units_pixels = (text_width_pixels / 26 + 1) / 2;
+    const int text_width_pixels = CanvasSkia::GetStringWidth(
+        ASCIIToUTF16("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
+        Font(this));
+    const double dialog_units_pixels = (text_width_pixels / 26 + 1) / 2;
     average_width_pixels_ = std::min(pango_width_pixels, dialog_units_pixels);
     pango_font_description_free(pango_desc);
   }
 }
 
 
 double PlatformFontPango::GetAverageWidth() const {
   const_cast<PlatformFontPango*>(this)->InitPangoMetrics();
   return average_width_pixels_;
 }
@@ skipping 16 matching lines @@
   return new PlatformFontPango(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontPango(font_name, font_size);
 }
 
 }  // namespace gfx