Shows Japanese and English mixed queries correctly.

ui/gfx/font_list_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/font_list.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 214 matching lines @@
   FontList font_list = FontList(fonts);
 
   FontList derived = font_list.DeriveFontListWithSize(5);
   const std::vector<Font>& derived_fonts = derived.GetFonts();
 
   EXPECT_EQ(2U, derived_fonts.size());
   EXPECT_EQ("Arial|5", FontToString(derived_fonts[0]));
   EXPECT_EQ("Sans serif|5", FontToString(derived_fonts[1]));
 }
 
+TEST(FontListTest, Fonts_GetHeight_GetBaseline) {
+  // If the font list has only one font, the height and baseline must be
+  // the same.
+  Font font_arial8("Arial", 8);
+  FontList font_list_arial8("Arial, 8px");
+  EXPECT_EQ(font_arial8.GetHeight(), font_list_arial8.GetHeight());
+  EXPECT_EQ(font_arial8.GetBaseline(), font_list_arial8.GetBaseline());
+
+  Font font_sansserif10("Sans serif", 10);
+  FontList font_list_sansserif10("Sans serif, 10px");
+  EXPECT_EQ(font_sansserif10.GetHeight(), font_list_sansserif10.GetHeight());
+  EXPECT_EQ(font_sansserif10.GetBaseline(),
+            font_list_sansserif10.GetBaseline());
+
+  // If there are two different fonts, the font list returns the max value.
+  FontList font_list_mix(font_arial8);
+  // Bypass DCHECK in a constructor of FontList which checks that all the fonts
+  // have the same font size.
+  font_list_mix.fonts_.push_back(font_sansserif10);
+  // Helvetica 20px must be larger than Arial 10px.
+  EXPECT_GT(font_sansserif10.GetHeight(), font_arial8.GetHeight());
+  EXPECT_EQ(font_sansserif10.GetHeight(), font_list_mix.GetHeight());
+  EXPECT_GT(font_sansserif10.GetBaseline(), font_arial8.GetBaseline());
+  EXPECT_EQ(font_sansserif10.GetBaseline(), font_list_mix.GetBaseline());
+}
+
 }  // namespace gfx