Renames gfx::FontList::Derive* family.

ui/gfx/font_list.h

Index: ui/gfx/font_list.h
diff --git a/ui/gfx/font_list.h b/ui/gfx/font_list.h
index 244da8835a07ee17faf591f1837bee275a4a2df3..73c67508841eb58b3f81dc3e65c61daecd11b7cb 100644
--- a/ui/gfx/font_list.h
+++ b/ui/gfx/font_list.h
@@ -66,21 +66,18 @@ class GFX_EXPORT FontList {
   // is changed.
   static void SetDefaultFontDescription(const std::string& font_description);
 
-  // Returns a new FontList with the given |font_style| flags.
-  FontList DeriveFontList(int font_style) const;
-
-  // Returns a new FontList with the same font names and style but with the
-  // given font |size| in pixels.
-  FontList DeriveFontListWithSize(int size) const;
-
-  // Returns a new FontList with the same font names and style but resized.
-  // |size_delta| is the size in pixels to add to the current font size.
-  FontList DeriveFontListWithSizeDelta(int size_delta) const;
-
   // Returns a new FontList with the same font names but resized and the given
   // style. |size_delta| is the size in pixels to add to the current font size.
   // |font_style| specifies the new style, which is a bitmask of the values:
   // Font::BOLD, Font::ITALIC and Font::UNDERLINE.
+  FontList Derive(int size_delta, int font_style) const;
+
+  // Returns a new FontList with the same font names and style but resized.
+  // |size_delta| is the size in pixels to add to the current font size.
+  FontList DeriveWithSizeDelta(int size_delta) const;
+
+  // Obsolete versions.  Use the abolve methods instead.
+  FontList DeriveFontListWithSizeDelta(int size_delta) const;
   FontList DeriveFontListWithSizeDeltaAndStyle(int size_delta,
                                                int font_style) const;
 
@@ -96,9 +93,6 @@ class GFX_EXPORT FontList {
   // Currently returns the cap height of the primary font.
   int GetCapHeight() const;
 
-  // Returns the number of horizontal pixels needed to display |text|.
-  int GetStringWidth(const base::string16& text) const;
-
   // Returns the expected number of horizontal pixels needed to display the
   // specified length of characters. Call GetStringWidth() to retrieve the
   // actual number.