Index: third_party/WebKit/Source/platform/fonts/AcceptLanguagesResolverTest.cpp |
diff --git a/third_party/WebKit/Source/platform/fonts/AcceptLanguagesResolverTest.cpp b/third_party/WebKit/Source/platform/fonts/AcceptLanguagesResolverTest.cpp |
index 94f636ea060aced4948f79379f07dcf7b46e6f36..efc026b13907d99ff5002c433502fcc6282d40c1 100644 |
--- a/third_party/WebKit/Source/platform/fonts/AcceptLanguagesResolverTest.cpp |
+++ b/third_party/WebKit/Source/platform/fonts/AcceptLanguagesResolverTest.cpp |
@@ -4,6 +4,7 @@ |
#include "platform/fonts/AcceptLanguagesResolver.h" |
+#include "platform/LayoutLocale.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace blink { |
@@ -27,6 +28,11 @@ TEST(AcceptLanguagesResolverTest, AcceptLanguagesChanged) |
{ "zh-HK", USCRIPT_TRADITIONAL_HAN, "zh-Hant" }, |
{ "zh-TW", USCRIPT_TRADITIONAL_HAN, "zh-Hant" }, |
+ // Language only. |
+ { "ja", USCRIPT_KATAKANA_OR_HIRAGANA, "ja-jp" }, |
+ { "ko", USCRIPT_HANGUL, "ko-kr" }, |
+ { "zh", USCRIPT_SIMPLIFIED_HAN, "zh-Hans" }, |
+ |
// Unusual combinations. |
{ "en-JP", USCRIPT_KATAKANA_OR_HIRAGANA, "ja-jp" }, |
@@ -39,13 +45,19 @@ TEST(AcceptLanguagesResolverTest, AcceptLanguagesChanged) |
{ "zh-TW,ja-JP", USCRIPT_TRADITIONAL_HAN, "zh-Hant" }, |
}; |
- for (auto& test : tests) { |
- AcceptLanguagesResolver::updateFromAcceptLanguages(test.acceptLanguages); |
+ for (const auto& test : tests) { |
+ const LayoutLocale* locale = |
+ AcceptLanguagesResolver::localeForHanFromAcceptLanguages( |
+ test.acceptLanguages); |
- EXPECT_EQ(test.script, AcceptLanguagesResolver::preferredHanScript()) |
- << test.acceptLanguages; |
- EXPECT_STREQ(test.locale, |
- AcceptLanguagesResolver::preferredHanSkFontMgrLocale()) |
+ if (test.script == USCRIPT_COMMON) { |
+ EXPECT_EQ(nullptr, locale) << test.acceptLanguages; |
+ continue; |
+ } |
+ |
+ ASSERT_NE(nullptr, locale) << test.acceptLanguages; |
+ EXPECT_EQ(test.script, locale->scriptForHan()) << test.acceptLanguages; |
+ EXPECT_STRCASEEQ(test.locale, locale->localeForHanForSkFontMgr()) |
<< test.acceptLanguages; |
} |
} |