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

ui/gfx/platform_font_win_unittest.cc

Index: ui/gfx/platform_font_win_unittest.cc
diff --git a/ui/gfx/platform_font_win_unittest.cc b/ui/gfx/platform_font_win_unittest.cc
index bfbe92203d1a6ccb02a1d2cd17c49415d3474729..1ecdde1d352db9d7b25e5a6c3ee62be48d79ca0a 100644
--- a/ui/gfx/platform_font_win_unittest.cc
+++ b/ui/gfx/platform_font_win_unittest.cc
@@ -20,15 +20,15 @@ gfx::Font AdjustFontSizeForHeight(const gfx::Font& base_font,
   Font expected_font = base_font;
   if (base_font.GetHeight() < target_height) {
     // Increase size while height is <= |target_height|.
-    Font larger_font = base_font.DeriveFont(1, 0);
+    Font larger_font = base_font.Derive(1, 0);
     while (larger_font.GetHeight() <= target_height) {
       expected_font = larger_font;
-      larger_font = larger_font.DeriveFont(1, 0);
+      larger_font = larger_font.Derive(1, 0);
     }
   } else if (expected_font.GetHeight() > target_height) {
     // Decrease size until height is <= |target_height|.
     do {
-      expected_font = expected_font.DeriveFont(-1, 0);
+      expected_font = expected_font.Derive(-1, 0);
     } while (expected_font.GetHeight() > target_height);
   }
   return expected_font;
@@ -60,7 +60,7 @@ TEST(PlatformFontWinTest, DeriveFontWithHeight) {
     EXPECT_EQ(Font::BOLD, derived_font.GetStyle());
 
     // Test that deriving from the new font has the expected result.
-    Font rederived_font = derived_font.DeriveFont(1, 0);
+    Font rederived_font = derived_font.Derive(1, 0);
     expected_font = Font(derived_font.GetFontName(),
                          derived_font.GetFontSize() + 1);
     EXPECT_EQ(expected_font.GetFontName(), rederived_font.GetFontName());