Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1623)

Unified Diff: chrome/browser/translate/translate_browsertest.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: chrome/browser/translate/translate_browsertest.cc
diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc
index 0f17fcb9f42e19687ba8142916171164739ea97b..62a7fecb5b7556dbd011736de438774f18c0eeb5 100644
--- a/chrome/browser/translate/translate_browsertest.cc
+++ b/chrome/browser/translate/translate_browsertest.cc
@@ -190,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, TranslateInIsolatedWorld) {
// Wait for the page title is changed after the test finished.
const base::string16 result = watcher.WaitAndGetTitle();
- EXPECT_EQ("PASS", UTF16ToASCII(result));
+ EXPECT_EQ("PASS", base::UTF16ToASCII(result));
}
IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTag) {
@@ -220,7 +220,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTag) {
// Wait for the page title is changed after the test finished.
const base::string16 result = watcher.WaitAndGetTitle();
- EXPECT_EQ("PASS", UTF16ToASCII(result));
+ EXPECT_EQ("PASS", base::UTF16ToASCII(result));
// Check if there is no Translate infobar.
translate = GetExistingTranslateInfoBarDelegate();
@@ -255,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest,
// Wait for the page title is changed after the test finished.
const base::string16 result = watcher.WaitAndGetTitle();
- EXPECT_EQ("PASS", UTF16ToASCII(result));
+ EXPECT_EQ("PASS", base::UTF16ToASCII(result));
// Check if there is no Translate infobar.
translate = GetExistingTranslateInfoBarDelegate();
@@ -289,7 +289,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTagAtOnload) {
// Wait for the page title is changed after the test finished.
const base::string16 result = watcher.WaitAndGetTitle();
- EXPECT_EQ("PASS", UTF16ToASCII(result));
+ EXPECT_EQ("PASS", base::UTF16ToASCII(result));
// Check if there is no Translate infobar.
translate = GetExistingTranslateInfoBarDelegate();
@@ -323,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {
// Wait for the page title is changed after the test finished.
const base::string16 result = watcher.WaitAndGetTitle();
- EXPECT_EQ("PASS", UTF16ToASCII(result));
+ EXPECT_EQ("PASS", base::UTF16ToASCII(result));
// Check if there is no Translate infobar.
translate = GetExistingTranslateInfoBarDelegate();
@@ -357,7 +357,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {
// Wait for the page title is changed after the test finished.
const base::string16 result = watcher.WaitAndGetTitle();
- EXPECT_EQ("PASS", UTF16ToASCII(result));
+ EXPECT_EQ("PASS", base::UTF16ToASCII(result));
// Check if there is no Translate infobar.
translate = GetExistingTranslateInfoBarDelegate();

Powered by Google App Engine
This is Rietveld 408576698