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

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

Issue 10795090: Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/debugger/devtools_sanity_browsertest.cc
===================================================================
--- chrome/browser/debugger/devtools_sanity_browsertest.cc (revision 148111)
+++ chrome/browser/debugger/devtools_sanity_browsertest.cc (working copy)
@@ -35,6 +35,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/worker_service.h"
#include "content/public/browser/worker_service_observer.h"
+#include "content/public/test/browser_test_utils.h"
#include "net/test/test_server.h"
using content::BrowserThread;
@@ -97,7 +98,7 @@
// checking that global variable uiTests exists(it's created after all js
// files have been loaded) and has runTest method.
ASSERT_TRUE(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
window->GetRenderViewHost(),
L"",
L"window.domAutomationController.send("
@@ -106,7 +107,7 @@
if (result == "function") {
ASSERT_TRUE(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
window->GetRenderViewHost(),
L"",
UTF8ToWide(base::StringPrintf("uiTests.runTest('%s')",
@@ -543,7 +544,7 @@
OpenDevToolsWindow("about:blank");
std::string result;
ASSERT_TRUE(
- ui_test_utils::ExecuteJavaScriptAndExtractString(
+ content::ExecuteJavaScriptAndExtractString(
window_->GetRenderViewHost(),
L"",
L"window.domAutomationController.send("
« no previous file with comments | « chrome/browser/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698