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

Unified Diff: content/public/test/browser_test_utils.h

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
« no previous file with comments | « content/browser/webrtc_browsertest.cc ('k') | content/public/test/browser_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_utils.h
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
index 64817a51f1f77afb76fe7360e7f0cd6f0db27b3d..8f7d3803747cd3cb51c0fb5e97add8f5345ac999 100644
--- a/content/public/test/browser_test_utils.h
+++ b/content/public/test/browser_test_utils.h
@@ -84,8 +84,8 @@ void SimulateKeyPress(WebContents* web_contents,
// If you want to extract a result, use one of the below functions.
// Returns true on success.
bool ExecuteJavaScript(RenderViewHost* render_view_host,
- const std::wstring& frame_xpath,
- const std::wstring& script) WARN_UNUSED_RESULT;
+ const std::string& frame_xpath,
+ const std::string& 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
@@ -93,17 +93,17 @@ bool ExecuteJavaScript(RenderViewHost* render_view_host,
// They return true on success, false if the script evaluation failed or did not
// evaluate to the expected type.
bool ExecuteJavaScriptAndExtractInt(RenderViewHost* render_view_host,
- const std::wstring& frame_xpath,
- const std::wstring& script,
+ const std::string& frame_xpath,
+ const std::string& script,
int* result) WARN_UNUSED_RESULT;
bool ExecuteJavaScriptAndExtractBool(RenderViewHost* render_view_host,
- const std::wstring& frame_xpath,
- const std::wstring& script,
+ const std::string& frame_xpath,
+ const std::string& script,
bool* result) WARN_UNUSED_RESULT;
bool ExecuteJavaScriptAndExtractString(
RenderViewHost* render_view_host,
- const std::wstring& frame_xpath,
- const std::wstring& script,
+ const std::string& frame_xpath,
+ const std::string& script,
std::string* result) WARN_UNUSED_RESULT;
// Returns the cookies for the given url.
« no previous file with comments | « content/browser/webrtc_browsertest.cc ('k') | content/public/test/browser_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698