Index: content/browser/child_process_launcher.cc |
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc |
index 3b95c14dc65d2f9aa0d52a074ff2d079e3946664..8b3cbf8e388c0c73a0c575f43c217bba631745da 100644 |
--- a/content/browser/child_process_launcher.cc |
+++ b/content/browser/child_process_launcher.cc |
@@ -475,6 +475,10 @@ base::TerminationStatus ChildProcessLauncher::GetChildTerminationStatus( |
context_->termination_status_ = |
base::GetKnownDeadTerminationStatus(handle, &context_->exit_code_); |
} else |
jar (doing other things)
2013/11/06 19:27:26
nit: This seems like a consistent style guide viol
ppi
2013/11/06 20:14:06
I'm not sure if I see how this could work. We can'
|
+#elif defined(OS_ANDROID) |
+ if (IsChildProcessOomProtected(handle)) { |
+ context_->termination_status_ = base::TERMINATION_STATUS_OOM_PROTECTED; |
+ } else |
#endif |
{ |
context_->termination_status_ = |