diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 12:36:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 12:36:33 +0000 |
| commit | bb7f4d3e98d48d9930502dcbf9b8eaf6f58f174d (patch) | |
| tree | 67b06bb785172129dc0d0c6730b555f4edd27031 /chrome/browser/ui/tests | |
| parent | 7153d83d9dd74251ee98d6d4d0794b84a374f990 (diff) | |
| download | chromium_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/ui/tests')
| -rw-r--r-- | chrome/browser/ui/tests/browser_uitest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/ui/tests/browser_uitest.cc b/chrome/browser/ui/tests/browser_uitest.cc index 680a86a..3b9c92c 100644 --- a/chrome/browser/ui/tests/browser_uitest.cc +++ b/chrome/browser/ui/tests/browser_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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. @@ -9,6 +9,7 @@ #include "base/string_util.h" #include "base/sys_info.h" #include "base/test/test_file_util.h" +#include "base/test/test_timeouts.h" #include "base/values.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/platform_util.h" @@ -113,7 +114,7 @@ TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { // Make sure that a new tab has been created and that we have a new renderer // process for it. ASSERT_TRUE(tab->NavigateToURLAsync(fork_url)); - PlatformThread::Sleep(sleep_timeout_ms()); + PlatformThread::Sleep(TestTimeouts::action_timeout_ms()); ASSERT_EQ(orig_process_count + 1, GetBrowserProcessCount()); int new_tab_count = -1; ASSERT_TRUE(window->GetTabCount(&new_tab_count)); @@ -166,7 +167,7 @@ TEST_F(BrowserTest, MAYBE_OtherRedirectsDontForkProcess) { // Make sure that a new tab but not new process has been created. ASSERT_TRUE(tab->NavigateToURLAsync(dont_fork_url)); - base::PlatformThread::Sleep(sleep_timeout_ms()); + base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms()); ASSERT_EQ(orig_process_count, GetBrowserProcessCount()); int new_tab_count = -1; ASSERT_TRUE(window->GetTabCount(&new_tab_count)); @@ -181,7 +182,7 @@ TEST_F(BrowserTest, MAYBE_OtherRedirectsDontForkProcess) { // Make sure that no new process has been created. ASSERT_TRUE(tab->NavigateToURLAsync(dont_fork_url2)); - base::PlatformThread::Sleep(sleep_timeout_ms()); + base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms()); ASSERT_EQ(orig_process_count, GetBrowserProcessCount()); } |