components/translate/language_detection/language_detection_util_unittest.cc - Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace.

Unified Diff: components/translate/language_detection/language_detection_util_unittest.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years 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 | « components/translate/language_detection/language_detection_util.cc ('k') | components/webdata/common/web_database_migration_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/translate/language_detection/language_detection_util_unittest.cc

diff --git a/components/translate/language_detection/language_detection_util_unittest.cc b/components/translate/language_detection/language_detection_util_unittest.cc

index c3bf6c1a60d3180d9d0396d812afbb632b14ce26..b66c57bff74541ba266f4c43c5258edff2991c07 100644

--- a/components/translate/language_detection/language_detection_util_unittest.cc

+++ b/components/translate/language_detection/language_detection_util_unittest.cc

@@ -94,7 +94,7 @@ TEST_F(LanguageDetectionUtilTest, WellKnownWrongConfiguration) {

// Tests that the language meta tag providing wrong information is ignored by

// LanguageDetectionUtil due to disagreement between meta tag and CLD.

TEST_F(LanguageDetectionUtilTest, CLDDisagreeWithWrongLanguageCode) {

- base::string16 contents = ASCIIToUTF16(

+ base::string16 contents = base::ASCIIToUTF16(

"<html><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 "

@@ -114,7 +114,7 @@ TEST_F(LanguageDetectionUtilTest, CLDDisagreeWithWrongLanguageCode) {

// Tests that the language meta tag providing "en-US" style information is

// agreed by CLD.

TEST_F(LanguageDetectionUtilTest, CLDAgreeWithLanguageCodeHavingCountryCode) {

- base::string16 contents = ASCIIToUTF16(

+ base::string16 contents = base::ASCIIToUTF16(

"<html><head><meta http-equiv='Content-Language' content='en-US'></head>"

"<body>This is a page apparently written in English. Even though "

"content-language is provided, the value will be ignored if the value "

@@ -135,7 +135,7 @@ TEST_F(LanguageDetectionUtilTest, CLDAgreeWithLanguageCodeHavingCountryCode) {

// CLD's language will be adopted by LanguageDetectionUtil due to an invalid

// meta tag.

TEST_F(LanguageDetectionUtilTest, InvalidLanguageMetaTagProviding) {

- base::string16 contents = ASCIIToUTF16(

+ base::string16 contents = base::ASCIIToUTF16(

"<html><head><meta http-equiv='Content-Language' content='utf-8'></head>"

"<body>This is a page apparently written in English. Even though "

"content-language is provided, the value will be ignored and CLD's"

@@ -155,7 +155,7 @@ TEST_F(LanguageDetectionUtilTest, InvalidLanguageMetaTagProviding) {

// Tests that the language meta tag providing wrong information is ignored

// because of valid html lang attribute.

TEST_F(LanguageDetectionUtilTest, AdoptHtmlLang) {

- base::string16 contents = ASCIIToUTF16(

+ base::string16 contents = base::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 "