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

Unified Diff: chrome/browser/extensions/app_process_apitest.cc

Issue 11728003: Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding files for gpu_tests and NaCl browser tests. Created 7 years, 12 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/extensions/app_process_apitest.cc
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index d85b04c39a19195d3f48d7d0caf660a377889946..241ad9d63348c4dfc113d17a1c36ec1895e1a894 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -225,8 +225,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
chrome::GetWebContentsAt(browser(), 6)->GetRenderProcessHost());
bool windowOpenerValid = false;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(window.opener != null)",
+ chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(window.opener != null)",
&windowOpenerValid));
ASSERT_TRUE(windowOpenerValid);
@@ -435,7 +436,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
content::Source<NavigationController>(
&chrome::GetActiveWebContents(browser())->GetController()));
ASSERT_TRUE(content::ExecuteJavaScript(contents->GetRenderViewHost(),
- L"", L"location.reload();"));
+ "", "location.reload();"));
js_reload_observer.Wait();
EXPECT_TRUE(process_map->Contains(
contents->GetRenderProcessHost()->GetID()));
@@ -447,7 +448,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
content::Source<NavigationController>(
&chrome::GetActiveWebContents(browser())->GetController()));
ASSERT_TRUE(content::ExecuteJavaScript(contents->GetRenderViewHost(),
- L"", L"location = location;"));
+ "", "location = location;"));
js_reload_observer2.Wait();
EXPECT_FALSE(process_map->Contains(
contents->GetRenderProcessHost()->GetID()));
@@ -556,8 +557,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromExtension) {
// App has loaded, and chrome.app.isInstalled should be true.
bool is_installed = false;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(chrome.app.isInstalled)",
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(chrome.app.isInstalled)",
&is_installed));
ASSERT_TRUE(is_installed);
}
@@ -625,8 +627,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) {
contents->GetRenderProcessHost()->GetID()));
bool is_installed = false;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(chrome.app.isInstalled)",
+ contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(chrome.app.isInstalled)",
&is_installed));
ASSERT_TRUE(is_installed);
@@ -639,8 +642,9 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) {
chrome::Reload(browser(), CURRENT_TAB);
observer.Wait();
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
- contents->GetRenderViewHost(), L"",
- L"window.domAutomationController.send(chrome.app.isInstalled)",
+ contents->GetRenderViewHost(),
+ "",
+ "window.domAutomationController.send(chrome.app.isInstalled)",
&is_installed));
ASSERT_TRUE(is_installed);
}

Powered by Google App Engine
This is Rietveld 408576698