diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:37:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:37:31 +0000 |
| commit | d64295933cbfd3bc984e851412cc79c8a0870acf (patch) | |
| tree | 8026b726dc498f4fa6f3e886b1612541ac6f0214 /chrome/browser/process_singleton_uitest.cc | |
| parent | 4f2063cce10295e8b982e98d466c9130d754a540 (diff) | |
| download | chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.zip chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.tar.gz chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.tar.bz2 | |
Remove action_max_timeout_ms and fix all the callers.
(This was a TODO for phajdan.jr).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6354005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_uitest.cc')
| -rw-r--r-- | chrome/browser/process_singleton_uitest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/process_singleton_uitest.cc b/chrome/browser/process_singleton_uitest.cc index f3ea3b4..cc9ec74 100644 --- a/chrome/browser/process_singleton_uitest.cc +++ b/chrome/browser/process_singleton_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. @@ -19,6 +19,7 @@ #include "base/ref_counted.h" #include "base/scoped_temp_dir.h" #include "base/threading/thread.h" +#include "base/test/test_timeouts.h" #include "base/synchronization/waitable_event.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_constants.h" @@ -144,8 +145,8 @@ class ProcessSingletonTest : public UITest { for (size_t i = 0; i < kNbThreads; ++i) { chrome_starter_threads_[i].reset(new base::Thread("ChromeStarter")); ASSERT_TRUE(chrome_starter_threads_[i]->Start()); - chrome_starters_[i] = new ChromeStarter(action_max_timeout_ms(), - temp_profile_dir_.path()); + chrome_starters_[i] = new ChromeStarter( + TestTimeouts::action_max_timeout_ms(), temp_profile_dir_.path()); } } |