Merge 161704 - Don't hang if can't downsize font.

ui/gfx/platform_font_win_unittest.cc

 // 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.
 
 #include "ui/gfx/platform_font_win.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font.h"
@@ skipping 74 matching lines @@
       static_cast<PlatformFontWin*>(base_font.platform_font());
 
   const Font derived_font =
       platform_font->DeriveFontWithHeight(min_font.GetHeight() - 1, 0);
   EXPECT_EQ(min_font.GetFontSize(), derived_font.GetFontSize());
   EXPECT_EQ(min_font.GetHeight(), derived_font.GetHeight());
 
   PlatformFontWin::get_minimum_font_size_callback = old_callback;
 }
 
+TEST(PlatformFontWinTest, DeriveFontWithHeight_TooSmall) {
+  const Font base_font;
+  PlatformFontWin* platform_font =
+      static_cast<PlatformFontWin*>(base_font.platform_font());
+
+  const Font derived_font = platform_font->DeriveFontWithHeight(1, 0);
+  EXPECT_GT(derived_font.GetHeight(), 1);
+}
+
 }  // namespace gfx