diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 04:02:34 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 04:02:34 +0000 |
| commit | 3b9f5aa2dba5e4374ced0b20a7fc14e57de08c21 (patch) | |
| tree | f501952c4f6143819b2269793229567fae99b9e2 /base/process_util.h | |
| parent | 72e8a0d3d8e67bf982cda8ba44fad975e2348ea1 (diff) | |
| download | chromium_src-3b9f5aa2dba5e4374ced0b20a7fc14e57de08c21.zip chromium_src-3b9f5aa2dba5e4374ced0b20a7fc14e57de08c21.tar.gz chromium_src-3b9f5aa2dba5e4374ced0b20a7fc14e57de08c21.tar.bz2 | |
Revert 53903 - Revert 52613 - Revert 52608 - Add and alternative GetAppOutput() to process_util that takes a timeout.
[For those keeping track, this removes it again. The failure wasn't a flake. :(]
[Undoing the revert to see if the failure wasn't a flake.... Revert if the
original failure, below, occurs again.]
["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
TBR=viettrungluu@chromium.org, tessamac@chromium.org
Review URL: http://codereview.chromium.org/3036023
TBR=viettrungluu@chromium.org, tessamac@chromium.org
Review URL: http://codereview.chromium.org/3045018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53908 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 a230f5d..d7ff940 100644 --- a/base/process_util.h +++ b/base/process_util.h @@ -86,9 +86,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, @@ -243,15 +240,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. |