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

Unified Diff: chrome/test/base/ui_test_utils.h

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/ui/webui/options2/options_ui_browsertest.cc ('k') | chrome/test/base/ui_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/ui_test_utils.h
===================================================================
--- chrome/test/base/ui_test_utils.h (revision 148111)
+++ chrome/test/base/ui_test_utils.h (working copy)
@@ -145,34 +145,6 @@
const GURL& url,
int number_of_navigations);
-// Executes the passed |script| in the frame pointed to by |frame_xpath| (use
-// empty string for main frame). The |script| should not invoke
-// domAutomationController.send(); otherwise, your test will hang or be flaky.
-// If you want to extract a result, use one of the below functions.
-// Returns true on success.
-bool ExecuteJavaScript(content::RenderViewHost* render_view_host,
- const std::wstring& frame_xpath,
- const std::wstring& script) WARN_UNUSED_RESULT;
-
-// The following methods executes the passed |script| in the frame pointed to by
-// |frame_xpath| (use empty string for main frame) and sets |result| to the
-// value returned by the script evaluation.
-// They return true on success, false if the script evaluation failed or did not
-// evaluate to the expected type.
-bool ExecuteJavaScriptAndExtractInt(content::RenderViewHost* render_view_host,
- const std::wstring& frame_xpath,
- const std::wstring& script,
- int* result) WARN_UNUSED_RESULT;
-bool ExecuteJavaScriptAndExtractBool(content::RenderViewHost* render_view_host,
- const std::wstring& frame_xpath,
- const std::wstring& script,
- bool* result) WARN_UNUSED_RESULT;
-bool ExecuteJavaScriptAndExtractString(
- content::RenderViewHost* render_view_host,
- const std::wstring& frame_xpath,
- const std::wstring& script,
- std::string* result) WARN_UNUSED_RESULT;
-
// Generate the file path for testing a particular test.
// The file for the tests is all located in
// test_root_directory/dir/<file>
« no previous file with comments | « chrome/browser/ui/webui/options2/options_ui_browsertest.cc ('k') | chrome/test/base/ui_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698