chrome/browser/ui/tests/browser_uitest.cc - Issue 6187002: Remove sleep_timeout_ms and fix all the callers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/tests/browser_uitest.cc

Issue 6187002: Remove sleep_timeout_ms and fix all the callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc ('k') | chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tests/browser_uitest.cc

diff --git a/chrome/browser/ui/tests/browser_uitest.cc b/chrome/browser/ui/tests/browser_uitest.cc

index 680a86a09c8759db6600f2fb705dcebcb212ce46..3b9c92c6b00b918c659854e7b01f7d8803793bf8 100644

--- a/chrome/browser/ui/tests/browser_uitest.cc

+++ b/chrome/browser/ui/tests/browser_uitest.cc

@@ -1,4 +1,4 @@

// 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());

}