diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 05:00:22 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 05:00:22 +0000 |
| commit | 838eb9df8b2796d968b884d81eece35e5dae8f87 (patch) | |
| tree | 8322f934f1d3411b443ae17885d51dda8b24df35 /base/process_util.h | |
| parent | 59ac0f420158f315f6d95c75f1fe2de6e9d5edd9 (diff) | |
| download | chromium_src-838eb9df8b2796d968b884d81eece35e5dae8f87.zip chromium_src-838eb9df8b2796d968b884d81eece35e5dae8f87.tar.gz chromium_src-838eb9df8b2796d968b884d81eece35e5dae8f87.tar.bz2 | |
Revert 52608 - Add and alternative GetAppOutput() to process_util that takes a timeout.
["base_unittests" didn't exit cleanly on "Chromium Linux x64" but was killed due
to timeout.]
Contributed by tessamac@chromium.org
TEST=none
BUG=47356
Review URL: http://codereview.chromium.org/2810014
Patch from Tessa MacDuff <tessamac@chromium.org>.
TBR=viettrungluu@chromium.org, tessamac@chromium.org
Review URL: http://codereview.chromium.org/3012004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util.h')
| -rw-r--r-- | base/process_util.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/base/process_util.h b/base/process_util.h index db68b84..48cef2c 100644 --- a/base/process_util.h +++ b/base/process_util.h @@ -85,9 +85,6 @@ struct IoCounters { // A minimalistic but hopefully cross-platform set of exit codes. // Do not change the enumeration values or you will break third-party // installers. -// Warning: This enum is duplicated and extended in chrome/common/result_codes.h -// The two must be kept in sync and users of that enum would prefer the -// numbering didn't change. enum { PROCESS_END_NORMAL_TERMINATION = 0, PROCESS_END_KILLED_BY_USER = 1, @@ -242,15 +239,6 @@ bool LaunchApp(const CommandLine& cl, bool GetAppOutput(const CommandLine& cl, std::string* output); #if defined(OS_POSIX) -// Similar to |GetAppOutput()|. Returns true if process launched and -// exited cleanly, with exit code indicating success. Waits no more than -// |timeout_milliseconds| for the launched process to exit. After timeout -// is triggered, the process is killed and true is stored in |timed_out|. -// Will wait for process to die so this may overrun |timeout_milliseconds|. -// TODO(tessamac): implement this for windows. -bool GetAppOutputWithTimeout(const CommandLine& cl, std::string* output, - bool* timed_out, int timeout_milliseconds); - // A restricted version of |GetAppOutput()| which (a) clears the environment, // and (b) stores at most |max_output| bytes; also, it doesn't search the path // for the command. |