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

ui/gfx/platform_font_win.cc

Index: ui/gfx/platform_font_win.cc
===================================================================
--- ui/gfx/platform_font_win.cc	(revision 118837)
+++ ui/gfx/platform_font_win.cc	(working copy)
@@ -13,7 +13,6 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/win_util.h"
-#include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
 
 namespace {
@@ -102,13 +101,6 @@
   return font_ref_->ave_char_width();
 }
 
-int PlatformFontWin::GetStringWidth(const string16& text) const {
-  int width = 0, height = 0;
-  CanvasSkia::SizeStringInt(text, Font(const_cast<PlatformFontWin*>(this)),
-                            &width, &height, gfx::Canvas::NO_ELLIPSIS);
-  return width;
-}
-
 int PlatformFontWin::GetExpectedTextWidth(int length) const {
   return length * std::min(font_ref_->dlu_base_x(), GetAverageCharacterWidth());
 }