summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 16:50:58 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-02 16:50:58 +0000
commit2290cb86f535d7babd4d84a2a08831404885e78c (patch)
tree09bca698a3e1a66c14ff50771dee24cd5751c918 /chrome/test/automation
parente9b3528e6a8d79f465fcdd2e44477f1eb9275539 (diff)
downloadchromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.zip
chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.gz
chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.bz2
Make webkit_glue not depend on default_plugin.
This removes a dependency cycle and should also make life easier for DRT. Revert http://codereview.chromium.org/1658012 Review URL: http://codereview.chromium.org/2358001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/tab_proxy.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index fbe2573..adcacf9 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -78,6 +78,8 @@ class TabProxy : public AutomationResourceProxy,
// will result in value = "string"
// jscript = "window.domAutomationController.send(24);"
// 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;