diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:32:00 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 18:32:00 +0000 |
| commit | eaac715956492f57bae3f30957662aca56462abe (patch) | |
| tree | 4a98772d114fcd710936a12ae1f03f38278cfba3 /content/browser/zygote_main_linux.cc | |
| parent | 407a38f923c6d76fe91de1bab7d8e190b6aa6f1d (diff) | |
| download | chromium_src-eaac715956492f57bae3f30957662aca56462abe.zip chromium_src-eaac715956492f57bae3f30957662aca56462abe.tar.gz chromium_src-eaac715956492f57bae3f30957662aca56462abe.tar.bz2 | |
Move the ProcessWatcher methods out of content/common/process_watcher into base/process_util, alongside the other process methods.
The only non-trivial move change is to the Windows implementation, where I changed KillProcess to use an exit code of kProcessKilledExitCode instead of content::RESULT_CODE_HUNG. cpu said that the existing code was incorrect, since GetTerminationStatus() should be mapping that result to TERMINATION_STATUS_PROCESS_WAS_KILLED. So I changed the exit code to kProcessKilledExitCode. This might make the UMA stats for killed processes to go up (and crashed to go down), but that will be an accounting change and should be zero-sum.
BUG=98716
Review URL: http://codereview.chromium.org/8674003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/zygote_main_linux.cc')
| -rw-r--r-- | content/browser/zygote_main_linux.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc index e2e174f..472b0b8 100644 --- a/content/browser/zygote_main_linux.cc +++ b/content/browser/zygote_main_linux.cc @@ -31,7 +31,6 @@ #include "content/common/chrome_descriptors.h" #include "content/common/font_config_ipc_linux.h" #include "content/common/pepper_plugin_registry.h" -#include "content/common/process_watcher.h" #include "content/common/sandbox_methods_linux.h" #include "content/common/seccomp_sandbox.h" #include "content/common/set_process_title.h" @@ -220,7 +219,7 @@ class Zygote { actual_child = child; } - ProcessWatcher::EnsureProcessTerminated(actual_child); + base::EnsureProcessTerminated(actual_child); } void HandleGetTerminationStatus(int fd, const Pickle& pickle, void* iter) { |