crash: Fixes following r413431

components/crash/content/browser/crash_dump_observer_android.cc

 // Copyright 2015 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 "components/crash/content/browser/crash_dump_observer_android.h"
 
 #include <unistd.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
   return base::Singleton<CrashDumpObserver>::get();
 }
 
 CrashDumpObserver::CrashDumpObserver() {
   notification_registrar_.Add(this,
                               content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
                               content::NotificationService::AllSources());
   notification_registrar_.Add(this,
                               content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                               content::NotificationService::AllSources());
+  BrowserChildProcessObserver::Add(this);
 }
 
-CrashDumpObserver::~CrashDumpObserver() {}
+CrashDumpObserver::~CrashDumpObserver() {
+  BrowserChildProcessObserver::Remove(this);
+}
 
 void CrashDumpObserver::OnChildExitOnBlockingPool(
     Client* client,
     int child_process_id,
     base::ProcessHandle pid,
     content::ProcessType process_type,
     base::TerminationStatus termination_status,
     base::android::ApplicationState app_state) {
   base::AutoLock auto_lock(registered_clients_lock_);
   // Only call Client::OnChildExit if we haven't been removed in the
@@ skipping 17 matching lines @@
     pool->PostSequencedWorkerTask(
         token, FROM_HERE,
         base::Bind(&CrashDumpObserver::OnChildExitOnBlockingPool,
                    base::Unretained(this), client, child_process_id, pid,
                    process_type, termination_status, app_state));
   }
 }
 
 void CrashDumpObserver::RegisterClient(Client* client) {
   base::AutoLock auto_lock(registered_clients_lock_);
   if (std::find(std::begin(registered_clients_), std::end(registered_clients_),

[Lei Zhang, 2016/09/02 01:06:14]

BTW, isn't this base::ContainsValue() ?

                 client) != std::end(registered_clients_)) {
     return;
   }
   registered_clients_.push_back(client);
 }
 
 void CrashDumpObserver::UnregisterClient(Client* client) {
   base::AutoLock auto_lock(registered_clients_lock_);
   registered_clients_.remove(client);
 }
 
 void CrashDumpObserver::BrowserChildProcessStarted(
     int child_process_id,
     content::FileDescriptorInfo* mappings) {
   base::AutoLock auto_lock(registered_clients_lock_);
   for (auto& client : registered_clients_) {

[Lei Zhang, 2016/09/02 01:06:14]

auto*

     client->OnChildStart(child_process_id, mappings);
   }
 }
 
 void CrashDumpObserver::BrowserChildProcessHostDisconnected(
     const content::ChildProcessData& data) {
   OnChildExit(data.id, data.handle,
               static_cast<content::ProcessType>(data.process_type),
               base::TERMINATION_STATUS_MAX_ENUM,
               base::android::APPLICATION_STATE_UNKNOWN);
@@ skipping 41 matching lines @@
     default:
       NOTREACHED();
       return;
   }
 
   OnChildExit(rph->GetID(), rph->GetHandle(), content::PROCESS_TYPE_RENDERER,
               term_status, app_state);
 }
 
 }  // namespace breakpad