Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3352)

Unified Diff: chrome/browser/renderer_host/browser_render_process_host.cc

Issue 131007: Linux: Enable metrics_service_uitest.cc. Take 2. (Closed)
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/metrics/metrics_service_uitest.cc ('k') | chrome/browser/zygote_host_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/browser_render_process_host.cc
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 29e7ef01df66a4a7ebe5fac1697c571c308484d6..06405ed8efcdbbeeadac3f206159b96e10c02b26 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -721,7 +721,18 @@ void BrowserRenderProcessHost::OnChannelError() {
DCHECK(channel_.get());
bool child_exited;
- bool did_crash = base::DidProcessCrash(&child_exited, process_.handle());
+ bool did_crash;
+ if (zygote_child_) {
+#if defined(OS_LINUX)
+ did_crash = Singleton<ZygoteHost>()->DidProcessCrash(
+ process_.handle(), &child_exited);
+#else
+ NOTREACHED();
+ did_crash = true;
+#endif
+ } else {
+ did_crash = base::DidProcessCrash(&child_exited, process_.handle());
+ }
NotificationService::current()->Notify(
NotificationType::RENDERER_PROCESS_CLOSED,
« no previous file with comments | « chrome/browser/metrics/metrics_service_uitest.cc ('k') | chrome/browser/zygote_host_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698