summaryrefslogtreecommitdiffstats
path: root/chrome/browser/errorpage_uitest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 12:36:33 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-11 12:36:33 +0000
commitbb7f4d3e98d48d9930502dcbf9b8eaf6f58f174d (patch)
tree67b06bb785172129dc0d0c6730b555f4edd27031 /chrome/browser/errorpage_uitest.cc
parent7153d83d9dd74251ee98d6d4d0794b84a374f990 (diff)
downloadchromium_src-bb7f4d3e98d48d9930502dcbf9b8eaf6f58f174d.zip
chromium_src-bb7f4d3e98d48d9930502dcbf9b8eaf6f58f174d.tar.gz
chromium_src-bb7f4d3e98d48d9930502dcbf9b8eaf6f58f174d.tar.bz2
Remove sleep_timeout_ms and fix all the callers.
(This was a TODO for phajdan.jr). BUG=None TEST=trybots Review URL: http://codereview.chromium.org/6187002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_uitest.cc')
-rw-r--r--chrome/browser/errorpage_uitest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/errorpage_uitest.cc b/chrome/browser/errorpage_uitest.cc
index 51b9754..7f10083 100644
--- a/chrome/browser/errorpage_uitest.cc
+++ b/chrome/browser/errorpage_uitest.cc
@@ -1,8 +1,9 @@
-// Copyright (c) 2010 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.
#include "base/string_util.h"
+#include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_test.h"
@@ -16,7 +17,7 @@ class ErrorPageTest : public UITest {
for (int i = 0; i < 10; ++i) {
if (GetActiveTabTitle() == title)
return true;
- base::PlatformThread::Sleep(sleep_timeout_ms());
+ base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
}
EXPECT_EQ(title, GetActiveTabTitle());
return false;