diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 16:34:15 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 16:34:15 +0000 |
| commit | f18744fd5ec25ee780633e039a9f53d2cce3b49c (patch) | |
| tree | 4d81c829dbf6e1710f546277a7907f5c0a928937 /chrome/test/ui_test_utils.cc | |
| parent | 966ddf0958e0e3eb3a145c5a9908bc8662e174be (diff) | |
| download | chromium_src-f18744fd5ec25ee780633e039a9f53d2cce3b49c.zip chromium_src-f18744fd5ec25ee780633e039a9f53d2cce3b49c.tar.gz chromium_src-f18744fd5ec25ee780633e039a9f53d2cce3b49c.tar.bz2 | |
Add ability to manipulate DOM elements from the automation proxy. Rework the way that javascript is packaged and parsed in the JavascriptExecutionController, and add some waiting methods.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1632001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index 9f01ff2..8b86ff8 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -430,9 +430,9 @@ DOMElementProxyRef GetActiveDOMDocument(Browser* browser) { JavaScriptExecutionController* executor = new InProcessJavaScriptExecutionController( browser->GetSelectedTabContents()->render_view_host()); - DOMElementProxy* main_doc = NULL; - executor->ExecuteJavaScriptAndParse("document;", &main_doc); - return main_doc; + int element_handle; + executor->ExecuteJavaScriptAndGetReturn("document;", &element_handle); + return executor->GetObjectProxy<DOMElementProxy>(element_handle); } Value* ExecuteJavaScript(RenderViewHost* render_view_host, |