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

Unified Diff: chrome/browser/automation/automation_tab_helper_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
« no previous file with comments | « chrome/browser/automation/automation_misc_browsertest.cc ('k') | chrome/browser/browser_focus_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/automation_tab_helper_browsertest.cc
===================================================================
--- chrome/browser/automation/automation_tab_helper_browsertest.cc (revision 148111)
+++ chrome/browser/automation/automation_tab_helper_browsertest.cc (working copy)
@@ -26,6 +26,7 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
#include "net/base/net_util.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -92,7 +93,7 @@
content::RenderViewHost* host =
chrome::GetActiveWebContents(browser())->GetRenderViewHost();
if (wait_for_response) {
- ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+ ASSERT_TRUE(content::ExecuteJavaScript(
host, L"", ASCIIToWide(script)));
} else {
script += "window.domAutomationController.setAutomationId(0);"
« no previous file with comments | « chrome/browser/automation/automation_misc_browsertest.cc ('k') | chrome/browser/browser_focus_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698