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

ui/gfx/font.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 "ui/gfx/font.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/platform_font.h"
 
 namespace gfx {
 
 ////////////////////////////////////////////////////////////////////////////////
 // Font, public:
 
 Font::Font() : platform_font_(PlatformFont::CreateDefault()) {
 }
 
@@ skipping 34 matching lines @@
 
 int Font::GetBaseline() const {
   return platform_font_->GetBaseline();
 }
 
 int Font::GetAverageCharacterWidth() const {
   return platform_font_->GetAverageCharacterWidth();
 }
 
 int Font::GetStringWidth(const string16& text) const {
-  return platform_font_->GetStringWidth(text);
+  return CanvasSkia::GetStringWidth(text, *this);
 }
 
 int Font::GetExpectedTextWidth(int length) const {
   return platform_font_->GetExpectedTextWidth(length);
 }
 
 int Font::GetStyle() const {
   return platform_font_->GetStyle();
 }
 
 std::string Font::GetFontName() const {
   return platform_font_->GetFontName();
 }
 
 int Font::GetFontSize() const {
   return platform_font_->GetFontSize();
 }
 
 NativeFont Font::GetNativeFont() const {
   return platform_font_->GetNativeFont();
 }
 
 }  // namespace gfx