content: convert child process notifications to observer usage

chrome/browser/android/crash_dump_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/crash_dump_manager.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 27 matching lines @@
   DCHECK(!instance_);
 
   instance_ = this;
 
   notification_registrar_.Add(this,
                               content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                               content::NotificationService::AllSources());
-  notification_registrar_.Add(this,
-      content::NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED,
-      content::NotificationService::AllSources());
-  notification_registrar_.Add(this,
-                              content::NOTIFICATION_CHILD_PROCESS_CRASHED,
-                              content::NotificationService::AllSources());
+
+  StartObservingBrowserChildProcesses();
 }
 
 CrashDumpManager::~CrashDumpManager() {
   instance_ = NULL;
+
+  StopObservingBrowserChildProcesses();
 }
 
 int CrashDumpManager::CreateMinidumpFile(int child_process_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER));
   base::FilePath minidump_path;
   if (!file_util::CreateTemporaryFile(&minidump_path))
     return base::kInvalidPlatformFileValue;
 
   base::PlatformFileError error;
   // We need read permission as the minidump is generated in several phases
   // and needs to be read at some point.
   int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ |
       base::PLATFORM_FILE_WRITE;
   base::PlatformFile minidump_file =
       base::CreatePlatformFile(minidump_path, flags, NULL, &error);
   if (minidump_file == base::kInvalidPlatformFileValue) {
     LOG(ERROR) << "Failed to create temporary file, crash won't be reported.";
     return base::kInvalidPlatformFileValue;
   }
 
   {
     base::AutoLock auto_lock(child_process_id_to_minidump_path_lock_);
     DCHECK(!ContainsKey(child_process_id_to_minidump_path_, child_process_id));
     child_process_id_to_minidump_path_[child_process_id] = minidump_path;
   }
   return minidump_file;
 }
 
+void CrashDumpManager::BrowserChildProcessHostDisconnected(
+    const content::ChildProcessData& data) {
+  OnChildExit(data.id, data.handle);
+}
+
+void CrashDumpManager::BrowserChildProcessCrashed(
+    const content::ChildProcessData& data) {
+  OnChildExit(data.id, data.handle);
+}
+
 void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path,
                                        base::ProcessHandle pid) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   int64 file_size = 0;
   int r = file_util::GetFileSize(minidump_path, &file_size);
   DCHECK(r) << "Failed to retrieve size for minidump "
             << minidump_path.value();
 
   if (file_size == 0) {
     // Empty minidump, this process did not crash. Just remove the file.
@@ skipping 24 matching lines @@
     file_util::Delete(minidump_path, false);
     return;
   }
   LOG(INFO) << "Crash minidump successfully generated: " <<
       crash_dump_dir.Append(filename).value();
 }
 
 void CrashDumpManager::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
-  int child_process_id;
-  base::ProcessHandle pid;
   switch (type) {
     case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED:
       // NOTIFICATION_RENDERER_PROCESS_TERMINATED is sent when the renderer
       // process is cleanly shutdown. However, we need to fallthrough so that
       // we close the minidump_fd we kept open.
     case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
       content::RenderProcessHost* rph =
           content::Source<content::RenderProcessHost>(source).ptr();
-      child_process_id = rph->GetID();
-      pid = rph->GetHandle();
-      break;
-    }
-    case content::NOTIFICATION_CHILD_PROCESS_CRASHED:
-    case content::NOTIFICATION_CHILD_PROCESS_HOST_DISCONNECTED: {
-      content::ChildProcessData* child_process_data =
-          content::Details<content::ChildProcessData>(details).ptr();
-      child_process_id = child_process_data->id;
-      pid = child_process_data->handle;
+      OnChildExit(rph->GetID(), rph->GetHandle());
       break;
     }
     default:
       NOTREACHED();
       return;
   }
+}
+
+void CrashDumpManager::OnChildExit(int child_process_id,
+                                   base::ProcessHandle pid) {
   base::FilePath minidump_path;
   {
     base::AutoLock auto_lock(child_process_id_to_minidump_path_lock_);
     ChildProcessIDToMinidumpPath::iterator iter =
         child_process_id_to_minidump_path_.find(child_process_id);
     if (iter == child_process_id_to_minidump_path_.end()) {
       // We might get a NOTIFICATION_RENDERER_PROCESS_TERMINATED and a
       // NOTIFICATION_RENDERER_PROCESS_CLOSED.
       return;
     }
     minidump_path = iter->second;
     child_process_id_to_minidump_path_.erase(iter);
   }
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&CrashDumpManager::ProcessMinidump, minidump_path, pid));
 }