| Index: chrome/browser/unload_uitest.cc
|
| ===================================================================
|
| --- chrome/browser/unload_uitest.cc (revision 117824)
|
| +++ chrome/browser/unload_uitest.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -16,8 +16,6 @@
|
| #include "ui/base/events.h"
|
| #include "ui/base/ui_base_types.h"
|
|
|
| -using base::TimeDelta;
|
| -
|
| const std::string NOLISTENERS_HTML =
|
| "<html><head><title>nolisteners</title></head><body></body></html>";
|
|
|
| @@ -107,12 +105,12 @@
|
| }
|
|
|
| void CheckTitle(const std::wstring& expected_title) {
|
| - const TimeDelta kCheckDelay = TimeDelta::FromMilliseconds(100);
|
| - for (TimeDelta max_wait_time = TestTimeouts::action_max_timeout();
|
| - max_wait_time > TimeDelta(); max_wait_time -= kCheckDelay) {
|
| + const int kCheckDelayMs = 100;
|
| + for (int max_wait_time = TestTimeouts::action_max_timeout_ms();
|
| + max_wait_time > 0; max_wait_time -= kCheckDelayMs) {
|
| if (expected_title == GetActiveTabTitle())
|
| break;
|
| - base::PlatformThread::Sleep(kCheckDelay);
|
| + base::PlatformThread::Sleep(kCheckDelayMs);
|
| }
|
|
|
| EXPECT_EQ(expected_title, GetActiveTabTitle());
|
| @@ -306,7 +304,7 @@
|
|
|
| // There's no real graceful way to wait for something _not_ to happen, so
|
| // we just wait a short period.
|
| - base::PlatformThread::Sleep(TestTimeouts::action_timeout());
|
| + base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
|
|
|
| CloseBrowserAsync(browser.get());
|
| ClickModalDialogButton(ui::DIALOG_BUTTON_OK);
|
|
|