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

Unified Diff: chrome/browser/devtools/devtools_sanity_browsertest.cc

Issue 11753009: Simplify ExecuteJavaScript* functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update prerender_browsertest.cc. 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/devtools/devtools_sanity_browsertest.cc
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 0f40d9ec2c5e1e020168e4b15c0adc4b46464efa..0d8ea1111e067af6ea85682d5532505827df0455 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -98,18 +98,16 @@ void RunTestFunction(DevToolsWindow* window, const char* test_name) {
// checking that global variable uiTests exists(it's created after all js
// files have been loaded) and has runTest method.
ASSERT_TRUE(
- content::ExecuteJavaScriptAndExtractString(
+ content::ExecuteScriptAndExtractString(
window->GetRenderViewHost(),
- "",
"window.domAutomationController.send("
" '' + (window.uiTests && (typeof uiTests.runTest)));",
&result));
if (result == "function") {
ASSERT_TRUE(
- content::ExecuteJavaScriptAndExtractString(
+ content::ExecuteScriptAndExtractString(
window->GetRenderViewHost(),
- "",
base::StringPrintf("uiTests.runTest('%s')", test_name),
&result));
EXPECT_EQ("[OK]", result);
@@ -530,9 +528,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) {
OpenDevToolsWindow("about:blank");
std::string result;
ASSERT_TRUE(
- content::ExecuteJavaScriptAndExtractString(
+ content::ExecuteScriptAndExtractString(
window_->GetRenderViewHost(),
- "",
"window.domAutomationController.send("
" '' + (window.uiTests && (typeof uiTests.runTest)));",
&result));
« no previous file with comments | « chrome/browser/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/do_not_track_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698