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

Unified Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 109013006: 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: fix 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/apps/shortcut_manager.cc ('k') | chrome/browser/apps/web_view_interactive_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/web_view_browsertest.cc
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
index ed32d5b03442a70fdbb9ca5c5d3c39d089c9acb3..e74f8be43ad77fd527141930edc2f55aa24d2a8c 100644
--- a/chrome/browser/apps/web_view_browsertest.cc
+++ b/chrome/browser/apps/web_view_browsertest.cc
@@ -449,8 +449,8 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
void ExecuteScriptWaitForTitle(content::WebContents* web_contents,
const char* script,
const char* title) {
- base::string16 expected_title(ASCIIToUTF16(title));
- base::string16 error_title(ASCIIToUTF16("error"));
+ base::string16 expected_title(base::ASCIIToUTF16(title));
+ base::string16 error_title(base::ASCIIToUTF16("error"));
content::TitleWatcher title_watcher(web_contents, expected_title);
title_watcher.AlsoWaitForTitle(error_title);
@@ -1552,8 +1552,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, SpeechRecognition) {
// way that this will trigger clicking on speech recognition input mic.
SimulateMouseClick(guest_web_contents, 0, blink::WebMouseEvent::ButtonLeft);
- base::string16 expected_title(ASCIIToUTF16("PASSED"));
- base::string16 error_title(ASCIIToUTF16("FAILED"));
+ base::string16 expected_title(base::ASCIIToUTF16("PASSED"));
+ base::string16 error_title(base::ASCIIToUTF16("FAILED"));
content::TitleWatcher title_watcher(guest_web_contents, expected_title);
title_watcher.AlsoWaitForTitle(error_title);
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
« no previous file with comments | « chrome/browser/apps/shortcut_manager.cc ('k') | chrome/browser/apps/web_view_interactive_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698