Clean-up: Renames gfx::Font's methods and removes its obsolete methods.

ui/gfx/platform_font_win.cc

Index: ui/gfx/platform_font_win.cc
diff --git a/ui/gfx/platform_font_win.cc b/ui/gfx/platform_font_win.cc
index 5f9a137387ed35e94a52b9386447f68c79ed3559..4acaf64b34abdb2ff9abb8b0755e588741f8f1e1 100644
--- a/ui/gfx/platform_font_win.cc
+++ b/ui/gfx/platform_font_win.cc
@@ -101,7 +101,7 @@ Font PlatformFontWin::DeriveFontWithHeight(int height, int style) {
     int font_height = font.GetHeight();
     int font_size = font.GetFontSize();
     while (font_height > height && font_size != min_font_size) {
-      font = font.DeriveFont(-1, style);
+      font = font.Derive(-1, style);
       if (font_height == font.GetHeight() && font_size == font.GetFontSize())
         break;
       font_height = font.GetHeight();
@@ -145,18 +145,9 @@ int PlatformFontWin::GetCapHeight() const {
   return font_ref_->cap_height();
 }
 
-int PlatformFontWin::GetAverageCharacterWidth() const {
-  return font_ref_->ave_char_width();
-}
-
-int PlatformFontWin::GetStringWidth(const base::string16& text) const {
-  return Canvas::GetStringWidth(text,
-                                Font(const_cast<PlatformFontWin*>(this)));
-}
-
 int PlatformFontWin::GetExpectedTextWidth(int length) const {
   return length * std::min(font_ref_->GetDluBaseX(),
-                           GetAverageCharacterWidth());
+                           font_ref_->ave_char_width());
 }
 
 int PlatformFontWin::GetStyle() const {