| Index: chrome/renderer/translate/translate_helper_unittest.cc
|
| diff --git a/chrome/renderer/translate/translate_helper_unittest.cc b/chrome/renderer/translate/translate_helper_unittest.cc
|
| index e1d1175b95985a97855660d202a9da477488edee..f92a815f8878c42960d0da9155360f2a9ecd1b3b 100644
|
| --- a/chrome/renderer/translate/translate_helper_unittest.cc
|
| +++ b/chrome/renderer/translate/translate_helper_unittest.cc
|
| @@ -90,8 +90,9 @@ TEST_F(TranslateHelperTest, CLDDisagreeWithWrongLanguageCode) {
|
| std::string cld_language;
|
| bool is_cld_reliable;
|
| std::string language =
|
| - TranslateHelper::DeterminePageLanguage(std::string("ja"), contents,
|
| - &cld_language, &is_cld_reliable);
|
| + TranslateHelper::DeterminePageLanguage(std::string("ja"), std::string(),
|
| + contents, &cld_language,
|
| + &is_cld_reliable);
|
| EXPECT_EQ(chrome::kUnknownLanguageCode, language);
|
| EXPECT_EQ("en", cld_language);
|
| EXPECT_TRUE(is_cld_reliable);
|
| @@ -108,7 +109,8 @@ TEST_F(TranslateHelperTest, CLDAgreeWithLanguageCodeHavingCountryCode) {
|
| std::string cld_language;
|
| bool is_cld_reliable;
|
| std::string language =
|
| - TranslateHelper::DeterminePageLanguage(std::string("en-US"), contents,
|
| + TranslateHelper::DeterminePageLanguage(std::string("en-US"),
|
| + std::string(), contents,
|
| &cld_language, &is_cld_reliable);
|
| EXPECT_EQ("en-US", language);
|
| EXPECT_EQ("en", cld_language);
|
| @@ -126,9 +128,30 @@ TEST_F(TranslateHelperTest, InvalidLanguageMetaTagProviding) {
|
| std::string cld_language;
|
| bool is_cld_reliable;
|
| std::string language =
|
| - TranslateHelper::DeterminePageLanguage(std::string("utf-8"), contents,
|
| + TranslateHelper::DeterminePageLanguage(std::string("utf-8"),
|
| + std::string(), contents,
|
| &cld_language, &is_cld_reliable);
|
| EXPECT_EQ("en", language);
|
| EXPECT_EQ("en", cld_language);
|
| EXPECT_TRUE(is_cld_reliable);
|
| }
|
| +
|
| +// Tests that the language meta tag providing wrong information is ignored
|
| +// because of valid html lang attribute.
|
| +TEST_F(TranslateHelperTest, AdoptHtmlLang) {
|
| + string16 contents = ASCIIToUTF16(
|
| + "<html lang='en'><head><meta http-equiv='Content-Language' content='ja'>"
|
| + "</head><body>This is a page apparently written in English. Even though "
|
| + "content-language is provided, the value will be ignored if the value "
|
| + "is suspicious.</body></html>");
|
| + std::string cld_language;
|
| + bool is_cld_reliable;
|
| + std::string language =
|
| + TranslateHelper::DeterminePageLanguage(std::string("ja"),
|
| + std::string("en"),
|
| + contents, &cld_language,
|
| + &is_cld_reliable);
|
| + EXPECT_EQ("en", language);
|
| + EXPECT_EQ("en", cld_language);
|
| + EXPECT_TRUE(is_cld_reliable);
|
| +}
|
|
|
Chromium Code Reviews
Issue 15728002:
Translate: adopt html lang attribute if valid value is provided (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src