chrome/browser/translate/translate_browsertest.cc - Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

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

Issue 120983002: Update some uses of UTF conversions in chrome/browser 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 | « chrome/browser/task_manager/worker_resource_provider.cc ('k') | chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/translate/translate_browsertest.cc

diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc

index e6ce383727929d83998378edf5f6f53961060b9d..ea76a235ce13d0713301f166926857eeb660b210 100644

--- a/chrome/browser/translate/translate_browsertest.cc

+++ b/chrome/browser/translate/translate_browsertest.cc

@@ -142,8 +142,8 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, TranslateInIsolatedWorld) {

content::WebContents* web_contents =

browser()->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(web_contents);

- content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));

- watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));

+ content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));

+ watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));

// Visit non-secure page which is going to be translated.

ui_test_utils::NavigateToURL(browser(), GetNonSecureURL(kFrenchTestPath));

@@ -205,8 +205,8 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTag) {

content::WebContents* web_contents =

browser()->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(web_contents);

- content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));

- watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));

+ content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));

+ watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));

// Visit a test page.

ui_test_utils::NavigateToURL(

@@ -240,8 +240,8 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest,

content::WebContents* web_contents =

browser()->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(web_contents);

- content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));

- watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));

+ content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));

+ watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));

// Visit a test page.

ui_test_utils::NavigateToURL(

@@ -274,8 +274,8 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTagAtOnload) {

content::WebContents* web_contents =

browser()->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(web_contents);

- content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));

- watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));

+ content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));

+ watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));

// Visit a test page.

ui_test_utils::NavigateToURL(

@@ -308,8 +308,8 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {

content::WebContents* web_contents =

browser()->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(web_contents);

- content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));

- watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));

+ content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));

+ watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));

// Visit a test page.

ui_test_utils::NavigateToURL(

@@ -342,8 +342,8 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {

content::WebContents* web_contents =

browser()->tab_strip_model()->GetActiveWebContents();

ASSERT_TRUE(web_contents);

- content::TitleWatcher watcher(web_contents, ASCIIToUTF16("PASS"));

- watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));

+ content::TitleWatcher watcher(web_contents, base::ASCIIToUTF16("PASS"));

+ watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));

// Visit a test page.

ui_test_utils::NavigateToURL(