diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 15:36:57 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 15:36:57 +0000 |
| commit | 366d01d8fc1b7e05795fb4525ef1d627baee1c3c (patch) | |
| tree | b1599a87630a4e2ab2dcda5586490c50ab758402 /chrome/test/ui/ui_test.cc | |
| parent | 46cc0a4dd4ddd93336e83dbbf19da94c45c339a3 (diff) | |
| download | chromium_src-366d01d8fc1b7e05795fb4525ef1d627baee1c3c.zip chromium_src-366d01d8fc1b7e05795fb4525ef1d627baee1c3c.tar.gz chromium_src-366d01d8fc1b7e05795fb4525ef1d627baee1c3c.tar.bz2 | |
Simplify how LayoutBrowserTest scraps a tab. This allows removal of a whole bunch of ancient code.
BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10800090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index dabb5f0..9ee6ead 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -41,7 +41,6 @@ #include "chrome/common/url_constants.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/proxy_launcher.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" @@ -119,8 +118,6 @@ void UITestBase::SetUp() { launcher_->AssertAppNotRunning("Please close any other instances " "of the app before testing."); - JavaScriptExecutionController::set_timeout( - TestTimeouts::action_max_timeout()); test_start_time_ = Time::NowFromSystemTime(); SetLaunchSwitches(); |