From bb7f4d3e98d48d9930502dcbf9b8eaf6f58f174d Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Tue, 11 Jan 2011 12:36:33 +0000 Subject: 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 --- chrome/browser/process_singleton_linux_uitest.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chrome/browser/process_singleton_linux_uitest.cc') diff --git a/chrome/browser/process_singleton_linux_uitest.cc b/chrome/browser/process_singleton_linux_uitest.cc index 6abcefe..7678770 100644 --- a/chrome/browser/process_singleton_linux_uitest.cc +++ b/chrome/browser/process_singleton_linux_uitest.cc @@ -1,4 +1,4 @@ -// 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. @@ -14,6 +14,7 @@ #include "base/eintr_wrapper.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/test/test_timeouts.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" @@ -170,7 +171,7 @@ TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessFailure) { NotifyOtherProcess(url, action_timeout_ms())); // Wait for a while to make sure the browser process is actually killed. - EXPECT_FALSE(CrashAwareSleep(sleep_timeout_ms())); + EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms())); } // Test that we don't kill ourselves by accident if a lockfile with the same pid @@ -224,7 +225,7 @@ TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessDifferingHost) { // Kill the browser process, so that it does not respond on the socket. kill(pid, SIGKILL); // Wait for a while to make sure the browser process is actually killed. - EXPECT_FALSE(CrashAwareSleep(sleep_timeout_ms())); + EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms())); EXPECT_EQ(0, unlink(lock_path_.value().c_str())); EXPECT_EQ(0, symlink("FAKEFOOHOST-1234", lock_path_.value().c_str())); @@ -246,7 +247,7 @@ TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessOrCreate_DifferingHost) { // Kill the browser process, so that it does not respond on the socket. kill(pid, SIGKILL); // Wait for a while to make sure the browser process is actually killed. - EXPECT_FALSE(CrashAwareSleep(sleep_timeout_ms())); + EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms())); EXPECT_EQ(0, unlink(lock_path_.value().c_str())); EXPECT_EQ(0, symlink("FAKEFOOHOST-1234", lock_path_.value().c_str())); -- cgit v1.1