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/ui_test.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/ui_test.cc')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index f9c5151..b7dd90a 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -34,6 +34,7 @@ #include "chrome/test/automation/automation_messages.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" +#include "chrome/test/automation/javascript_execution_controller.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" #include "chrome/test/chrome_process_util.h" @@ -166,6 +167,7 @@ void UITestBase::SetUp() { } InitializeTimeouts(); + JavaScriptExecutionController::set_timeout(action_max_timeout_ms_); LaunchBrowserAndServer(); } |