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

Unified Diff: chrome/test/automation/tab_proxy.h

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/test/automation/tab_proxy.h
===================================================================
--- chrome/test/automation/tab_proxy.h (revision 73855)
+++ chrome/test/automation/tab_proxy.h (working copy)
@@ -66,7 +66,7 @@
bool GetCurrentURL(GURL* url) const WARN_UNUSED_RESULT;
// Gets the title of the tab.
- bool GetTabTitle(std::wstring* title) const WARN_UNUSED_RESULT;
+ bool GetTabTitle(string16* title) const WARN_UNUSED_RESULT;
// Gets the tabstrip index of the tab.
bool GetTabIndex(int* index) const WARN_UNUSED_RESULT;
@@ -83,17 +83,17 @@
// will result in value = 24
// NOTE: If this is called from a ui test, |dom_automation_enabled_| must be
// set to true for these functions to work.
- bool ExecuteAndExtractString(const std::wstring& frame_xpath,
- const std::wstring& jscript,
- std::wstring* value) WARN_UNUSED_RESULT;
- bool ExecuteAndExtractBool(const std::wstring& frame_xpath,
- const std::wstring& jscript,
+ bool ExecuteAndExtractString(const string16& frame_xpath,
+ const string16& jscript,
+ string16* value) WARN_UNUSED_RESULT;
+ bool ExecuteAndExtractBool(const string16& frame_xpath,
+ const string16& jscript,
bool* value) WARN_UNUSED_RESULT;
- bool ExecuteAndExtractInt(const std::wstring& frame_xpath,
- const std::wstring& jscript,
+ bool ExecuteAndExtractInt(const string16& frame_xpath,
+ const string16& jscript,
int* value) WARN_UNUSED_RESULT;
- bool ExecuteAndExtractValue(const std::wstring& frame_xpath,
- const std::wstring& jscript,
+ bool ExecuteAndExtractValue(const string16& frame_xpath,
+ const string16& jscript,
Value** value) WARN_UNUSED_RESULT;
// Returns a DOMElementProxyRef to the tab's current DOM document.
@@ -209,8 +209,8 @@
// Supply or cancel authentication to a login prompt. These are synchronous
// calls and hence block until the load finishes (or another login prompt
// appears, in the case of invalid login info).
- bool SetAuth(const std::wstring& username,
- const std::wstring& password) WARN_UNUSED_RESULT;
+ bool SetAuth(const string16& username,
+ const string16& password) WARN_UNUSED_RESULT;
bool CancelAuth() WARN_UNUSED_RESULT;
// Checks if this tab has a login prompt waiting for auth. This will be

Powered by Google App Engine
This is Rietveld 408576698