diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 19:38:21 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 19:38:21 +0000 |
commit | d0e629845f2ce6886377c093b62cd42f7e7da23d (patch) | |
tree | 7f7423722a03ecd8296d60bd8ed218ed2d4397e3 /chrome/browser/zygote_host_linux.cc | |
parent | dfcb62a173898e182e2f10ca635deb753977b9f8 (diff) | |
download | chromium_src-d0e629845f2ce6886377c093b62cd42f7e7da23d.zip chromium_src-d0e629845f2ce6886377c093b62cd42f7e7da23d.tar.gz chromium_src-d0e629845f2ce6886377c093b62cd42f7e7da23d.tar.bz2 |
Revert r18641: "Linux: Enable metrics_service_uitest.cc."
Broke ui_tests.
Review URL: http://codereview.chromium.org/125268
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/zygote_host_linux.cc')
-rw-r--r-- | chrome/browser/zygote_host_linux.cc | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/chrome/browser/zygote_host_linux.cc b/chrome/browser/zygote_host_linux.cc index 230373c..1c582a3 100644 --- a/chrome/browser/zygote_host_linux.cc +++ b/chrome/browser/zygote_host_linux.cc @@ -94,38 +94,3 @@ void ZygoteHost::EnsureProcessTerminated(pid_t process) { HANDLE_EINTR(write(control_fd_, pickle.data(), pickle.size())); } - -bool ZygoteHost::DidProcessCrash(base::ProcessHandle handle, - bool* child_exited) { - Pickle pickle; - pickle.WriteInt(kCmdDidProcessCrash); - pickle.WriteInt(handle); - - HANDLE_EINTR(write(control_fd_, pickle.data(), pickle.size())); - - static const unsigned kMaxMessageLength = 128; - char buf[kMaxMessageLength]; - const ssize_t len = HANDLE_EINTR(read(control_fd_, buf, sizeof(buf))); - - if (len == -1) { - LOG(WARNING) << "Error reading message from zygote: " << errno; - return false; - } else if (len == 0) { - LOG(WARNING) << "Socket closed prematurely."; - return false; - } - - Pickle read_pickle(buf, len); - bool did_crash, tmp_child_exited; - void* iter = NULL; - if (!read_pickle.ReadBool(&iter, &did_crash) || - !read_pickle.ReadBool(&iter, &tmp_child_exited)) { - LOG(WARNING) << "Error parsing DidProcessCrash response from zygote."; - return false; - } - - if (child_exited) - *child_exited = tmp_child_exited; - - return did_crash; -} |