3 files changed, 8 insertions, 18 deletions
diff --git a/chrome/common/notification_type.h b/chrome/common/notification_type.h
index 5de67e7..1ba2c39 100644
--- a/chrome/common/notification_type.h
+++ b/chrome/common/notification_type.h
@@ -537,20 +537,12 @@ class NotificationType {
     // The details are in a Details<ChildProcessInfo>.
     CHILD_PROCESS_HOST_DISCONNECTED,
 
-    // This message is sent when a child process disappears
-    // unexpectedly as a result of a crash.  There is no usable
-    // source, since it is sent from an ephemeral task; register for
-    // AllSources() to receive this notification.  The details are in
-    // a Details<ChildProcessInfo>.
+    // This message is sent when a child process disappears unexpectedly.
+    // There is no usable source, since it is sent from an ephemeral task;
+    // register for AllSources() to receive this notification.  The details are
+    // in a Details<ChildProcessInfo>.
     CHILD_PROCESS_CRASHED,
 
-    // This message is sent when a child process disappears
-    // unexpectedly as a result of a termination signal.  There is no
-    // usable source, since it is sent from an ephemeral task;
-    // register for AllSources() to receive this notification.  The
-    // details are in a Details<ChildProcessInfo>.
-    CHILD_PROCESS_WAS_KILLED,
-
     // This message indicates that an instance of a particular child was
     // created in a page.  (If one page contains several regions rendered by
     // the same child, this notification will occur once for each region
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 40c1886..75eacdf 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1163,9 +1163,7 @@ IPC_BEGIN_MESSAGES(ViewHost)
 
   // Indicates the renderer process is gone.  This actually is sent by the
   // browser process to itself, but keeps the interface cleaner.
-  IPC_MESSAGE_ROUTED2(ViewHostMsg_RenderViewGone,
-                      int, /* this really is base::TerminationStatus */
-                      int /* exit_code */)
+  IPC_MESSAGE_ROUTED0(ViewHostMsg_RenderViewGone)
 
   // Sent by the renderer process to request that the browser close the view.
   // This corresponds to the window.close() API, and the browser may ignore
diff --git a/chrome/common/result_codes.h b/chrome/common/result_codes.h
index 94ba503..6625cb0 100644
--- a/chrome/common/result_codes.h
+++ b/chrome/common/result_codes.h
@@ -21,9 +21,9 @@
 class ResultCodes {
  public:
   enum ExitCode {
-    NORMAL_EXIT = base::TERMINATION_STATUS_NORMAL_TERMINATION,
-    TASKMAN_KILL = base::TERMINATION_STATUS_PROCESS_WAS_KILLED,
-    HUNG = base::TERMINATION_STATUS_PROCESS_WAS_HUNG,
+    NORMAL_EXIT = base::PROCESS_END_NORMAL_TERMINATION,
+    TASKMAN_KILL = base::PROCESS_END_KILLED_BY_USER,
+    HUNG = base::PROCESS_END_PROCESS_WAS_HUNG,
     INVALID_CMDLINE_URL,        // An invalid command line url was given.
     SBOX_INIT_FAILED,           // The sandbox could not be initialized.
     GOOGLE_UPDATE_INIT_FAILED,  // The Google Update client stub init failed.