Merge 2840: Disable CJK specific generic font families for monospace on Android

third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp

Index: third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp
index 37c9e89075b19ee7efee48545ae59d809a8579f4..616e5a96fddc8984a8e92b95249f0874f33fa3ab 100644
--- a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp
+++ b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroidTest.cpp
@@ -26,4 +26,27 @@ TEST(FontCacheAndroid, fallbackFontForCharacter)
     EXPECT_TRUE(fontData);
 }
 
+TEST(FontCacheAndroid, genericFamilyNameForScript)
+{
+    FontDescription english;
+    english.setLocale(LayoutLocale::get("en"));
+    FontDescription chinese;
+    chinese.setLocale(LayoutLocale::get("zh"));
+
+    if (FontFamilyNames::webkit_standard.isEmpty())
+        FontFamilyNames::init();
+
+    // For non-CJK, getGenericFamilyNameForScript should return the given familyName.
+    EXPECT_EQ(FontFamilyNames::webkit_standard, FontCache::getGenericFamilyNameForScript(
+        FontFamilyNames::webkit_standard, english));
+    EXPECT_EQ(FontFamilyNames::webkit_monospace, FontCache::getGenericFamilyNameForScript(
+        FontFamilyNames::webkit_monospace, english));
+
+    // For CJK, getGenericFamilyNameForScript should return CJK fonts except monospace.
+    EXPECT_NE(FontFamilyNames::webkit_standard, FontCache::getGenericFamilyNameForScript(
+        FontFamilyNames::webkit_standard, chinese));
+    EXPECT_EQ(FontFamilyNames::webkit_monospace, FontCache::getGenericFamilyNameForScript(
+        FontFamilyNames::webkit_monospace, chinese));
+}
+
 } // namespace blink