trunk/src/chrome/renderer/translate/translate_helper_unittest.cc - Issue 16045007: Revert 202427 "Translate: adopt html lang attribute if valid val..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/renderer/translate/translate_helper_unittest.cc

Issue 16045007: Revert 202427 "Translate: adopt html lang attribute if valid val..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « trunk/src/chrome/renderer/translate/translate_helper_metrics_unittest.cc ('k') | trunk/src/tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/renderer/translate/translate_helper_unittest.cc

===================================================================

--- trunk/src/chrome/renderer/translate/translate_helper_unittest.cc (revision 202442)

+++ trunk/src/chrome/renderer/translate/translate_helper_unittest.cc (working copy)

@@ -90,9 +90,8 @@

std::string cld_language;

bool is_cld_reliable;

std::string language =

- TranslateHelper::DeterminePageLanguage(std::string("ja"), std::string(),

- contents, &cld_language,

- &is_cld_reliable);

+ TranslateHelper::DeterminePageLanguage(std::string("ja"), contents,

+ &cld_language, &is_cld_reliable);

EXPECT_EQ(chrome::kUnknownLanguageCode, language);

EXPECT_EQ("en", cld_language);

EXPECT_TRUE(is_cld_reliable);

@@ -109,8 +108,7 @@

std::string cld_language;

bool is_cld_reliable;

std::string language =

- TranslateHelper::DeterminePageLanguage(std::string("en-US"),

- std::string(), contents,

+ TranslateHelper::DeterminePageLanguage(std::string("en-US"), contents,

&cld_language, &is_cld_reliable);

EXPECT_EQ("en-US", language);

EXPECT_EQ("en", cld_language);

@@ -128,30 +126,9 @@

std::string cld_language;

bool is_cld_reliable;

std::string language =

- TranslateHelper::DeterminePageLanguage(std::string("utf-8"),

- std::string(), contents,

+ TranslateHelper::DeterminePageLanguage(std::string("utf-8"), 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);