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

ui/gfx/platform_font_win.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/platform_font_win.h"
 
 #include <windows.h>
 #include <math.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #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 {
 
 // If the tmWeight field of a TEXTMETRIC structure has a value >= this, the
 // font is bold.
 const int kTextMetricWeightBold = 700;
 
 // Returns either minimum font allowed for a current locale or
 // lf_height + size_delta value.
@@ skipping 68 matching lines @@
 }
 
 int PlatformFontWin::GetBaseline() const {
   return font_ref_->baseline();
 }
 
 int PlatformFontWin::GetAverageCharacterWidth() const {
   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());
 }
 
 int PlatformFontWin::GetStyle() const {
   return font_ref_->style();
 }
 
 std::string PlatformFontWin::GetFontName() const {
   return font_ref_->font_name();
@@ skipping 127 matching lines @@
   return new PlatformFontWin(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontWin(font_name, font_size);
 }
 
 }  // namespace gfx