diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 19:56:14 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 19:56:14 +0000 |
| commit | a771dc3feb97ae20170cf5617ba48d6340549698 (patch) | |
| tree | 2482dd2533a3341ede166407b6eb3761a28ec4e7 /chrome/test/automation/tab_proxy.h | |
| parent | 0f786468a0c44da5093c6759915e1c0384535adf (diff) | |
| download | chromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.zip chromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.tar.gz chromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.tar.bz2 | |
Revert 74118 - Remove wstring from RVH's run Javascript command.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6312154
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6459002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/tab_proxy.h')
| -rw-r--r-- | chrome/test/automation/tab_proxy.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index c13a1b2..e8dc599 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -66,7 +66,7 @@ class TabProxy : public AutomationResourceProxy, bool GetCurrentURL(GURL* url) const WARN_UNUSED_RESULT; // Gets the title of the tab. - bool GetTabTitle(string16* title) const WARN_UNUSED_RESULT; + bool GetTabTitle(std::wstring* title) const WARN_UNUSED_RESULT; // Gets the tabstrip index of the tab. bool GetTabIndex(int* index) const WARN_UNUSED_RESULT; @@ -83,17 +83,17 @@ class TabProxy : public AutomationResourceProxy, // 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 string16& frame_xpath, - const string16& jscript, - string16* value) WARN_UNUSED_RESULT; - bool ExecuteAndExtractBool(const string16& frame_xpath, - const string16& jscript, + 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* value) WARN_UNUSED_RESULT; - bool ExecuteAndExtractInt(const string16& frame_xpath, - const string16& jscript, + bool ExecuteAndExtractInt(const std::wstring& frame_xpath, + const std::wstring& jscript, int* value) WARN_UNUSED_RESULT; - bool ExecuteAndExtractValue(const string16& frame_xpath, - const string16& jscript, + bool ExecuteAndExtractValue(const std::wstring& frame_xpath, + const std::wstring& jscript, Value** value) WARN_UNUSED_RESULT; // Returns a DOMElementProxyRef to the tab's current DOM document. @@ -209,8 +209,8 @@ class TabProxy : public AutomationResourceProxy, // 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 string16& username, - const string16& password) WARN_UNUSED_RESULT; + bool SetAuth(const std::wstring& username, + const std::wstring& password) WARN_UNUSED_RESULT; bool CancelAuth() WARN_UNUSED_RESULT; // Checks if this tab has a login prompt waiting for auth. This will be |