Relanding this with font test fixes for gdi.

ui/gfx/platform_font_win.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_GFX_PLATFORM_FONT_WIN_H_
 #define UI_GFX_PLATFORM_FONT_WIN_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 31 matching lines @@
   // performed other than clamping to a minimum font height if
   // |get_minimum_font_size_callback| is specified.
   typedef void (*AdjustFontCallback)(LOGFONT* lf);
   static AdjustFontCallback adjust_font_callback;
 
   // Returns the font name for the system locale. Some fonts, particularly
   // East Asian fonts, have different names per locale. If the localized font
   // name could not be retrieved, returns GetFontName().
   std::string GetLocalizedFontName() const;
 
-  // Returns a derived Font with the specified |style| and with height at most
-  // |height|. If the height and style of the receiver already match, it is
-  // returned. Otherwise, the returned Font will have the largest size such that
-  // its height is less than or equal to |height| (since there may not exist a
-  // size that matches the exact |height| specified).
+  // Returns a derived Font with the specified |style| and maximum |height|.
+  // The returned Font will be the largest font size with a height <= |height|,
+  // since a size with the exact specified |height| may not necessarily exist.
+  // GetMinimumFontSize() may impose a font size that is taller than |height|

[msw, 2015/01/13 23:54:59]

nit: trailing period.

[ananta, 2015/01/14 00:17:23]

Done.

   Font DeriveFontWithHeight(int height, int style);
 
   // Overridden from PlatformFont:
   virtual Font DeriveFont(int size_delta, int style) const override;
   virtual int GetHeight() const override;
   virtual int GetBaseline() const override;
   virtual int GetCapHeight() const override;
   virtual int GetExpectedTextWidth(int length) const override;
   virtual int GetStyle() const override;
   virtual std::string GetFontName() const override;
@@ skipping 98 matching lines @@
   static HFontRef* GetBaseFontRef();
 
   // Creates and returns a new HFontRef from the specified HFONT.
   static HFontRef* CreateHFontRef(HFONT font);
 
   // Creates and returns a new HFontRef from the specified HFONT. Uses provided
   // |font_metrics| instead of calculating new one.
   static HFontRef* CreateHFontRefFromGDI(HFONT font,
                                          const TEXTMETRIC& font_metrics);
 
-  // Returns a largest derived Font whose height does not exceed the height of
-  // |base_font|.
-  static Font DeriveWithCorrectedSize(HFONT base_font);
-
   // Creates and returns a new HFontRef from the specified HFONT using metrics
   // from skia. Currently this is only used if we use DirectWrite for font
   // metrics.
   // |gdi_font| : Handle to the GDI font created via CreateFontIndirect.
   // |font_metrics| : The GDI font metrics retrieved via the GetTextMetrics
   // API. This is currently used to calculate the correct height of the font
   // in case we get a font created with a positive height.
   // A positive height represents the cell height (ascent + descent).
   // A negative height represents the character Em height which is cell
   // height minus the internal leading value.
   static PlatformFontWin::HFontRef* CreateHFontRefFromSkia(
       HFONT gdi_font,
       const TEXTMETRIC& font_metrics);
 
   // Creates a new PlatformFontWin with the specified HFontRef. Used when
   // constructing a Font from a HFONT we don't want to copy.
   explicit PlatformFontWin(HFontRef* hfont_ref);
 
+  // Returns a HFONT with the specified |style| and maximum |height|.
+  // The returned HFONT will be the largest font size with a

[msw, 2015/01/13 23:54:59]

nit: s/HFONT/font/ to fix line wrapping.

[ananta, 2015/01/14 00:17:23]

Removed this function.

+  // height <= |height|, since a size with the exact specified |height| may
+  // not necessarily exist.
+  // GetMinimumFontSize() may impose a font size that is taller than |height|

[msw, 2015/01/13 23:54:59]

nit: trailing period.

[ananta, 2015/01/14 00:17:23]

Removed this function

+  HFONT CreateFontWithHeight(int height, int style);
+
     // Reference to the base font all fonts are derived from.
   static HFontRef* base_font_ref_;
 
   // Indirect reference to the HFontRef, which references the underlying HFONT.
   scoped_refptr<HFontRef> font_ref_;
 
   // Pointer to the global IDWriteFactory interface.
   static IDWriteFactory* direct_write_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformFontWin);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_PLATFORM_FONT_WIN_H_