Revert "Refactor CrashDump*Manager to use a shared CrashDumpObserver singleton."

chrome/browser/chrome_browser_main_android.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/chrome_browser_main_android.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/seccomp_support_detector.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/descriptors_android.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/main_function_params.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/resource/resource_bundle_android.h"
 #include "ui/base/ui_base_paths.h"
 
 namespace {
 
 void DeleteFileTask(
     const base::FilePath& file_path) {
   if (base::PathExists(file_path))
     base::DeleteFile(file_path, false);
 }
 
 } // namespace
 
 ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainParts(parameters) {
 }
 
 ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() {
-  breakpad::CrashDumpObserver::GetInstance()->UnregisterClient(
-      crash_dump_manager_.get());
 }
 
 int ChromeBrowserMainPartsAndroid::PreCreateThreads() {
   TRACE_EVENT0("startup", "ChromeBrowserMainPartsAndroid::PreCreateThreads")
 
-// The CrashDumpManager must be initialized before any child
-// process is created (as they need to access it during
-// creation). Such processes are created on the PROCESS_LAUNCHER
-// thread, and so the manager is initialized before that thread is
-// created.
+  // The CrashDumpManager must be initialized before any child process is
+  // created (as they need to access it during creation). Such processes
+  // are created on the PROCESS_LAUNCHER thread, and so the manager is
+  // initialized before that thread is created.
 #if defined(GOOGLE_CHROME_BUILD)
   // TODO(jcivelli): we should not initialize the crash-reporter when it was not
   // enabled. Right now if it is disabled we still generate the minidumps but we
   // do not upload them.
   bool breakpad_enabled = true;
 #else
   bool breakpad_enabled = false;
 #endif
 
   // Allow Breakpad to be enabled in Chromium builds for testing purposes.
   if (!breakpad_enabled)
     breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableCrashReporterForTesting);
 
   if (breakpad_enabled) {
     base::FilePath crash_dump_dir;
     PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir);
-    crash_dump_manager_ = base::MakeUnique<breakpad::CrashDumpManager>(
-        crash_dump_dir, kAndroidMinidumpDescriptor);
-    breakpad::CrashDumpObserver::GetInstance()->RegisterClient(
-        crash_dump_manager_.get());
+    crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir));
   }
 
   ui::SetLocalePaksStoredInApk(false);
 
   return ChromeBrowserMainParts::PreCreateThreads();
 }
 
 void ChromeBrowserMainPartsAndroid::PostProfileInit() {
   ChromeBrowserMainParts::PostProfileInit();
 
@@ skipping 41 matching lines @@
   ChromeBrowserMainParts::PostBrowserStart();
 
   content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE,
       base::Bind(&SeccompSupportDetector::StartDetection),
       base::TimeDelta::FromMinutes(1));
 }
 
 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
   NOTREACHED();
 }