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

android_webview/browser/aw_browser_main_parts.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 "android_webview/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
-#include "android_webview/browser/aw_browser_terminator.h"
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/aw_dev_tools_discovery_provider.h"
 #include "android_webview/browser/aw_result_codes.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/net/aw_network_change_notifier_factory.h"
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/aw_switches.h"
 #include "base/android/apk_assets.h"
 #include "base/android/build_info.h"
 #include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
-#include "components/crash/content/browser/crash_dump_observer_android.h"
+#include "components/crash/content/browser/crash_micro_dump_manager_android.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "device/geolocation/access_token_store.h"
 #include "device/geolocation/geolocation_delegate.h"
 #include "device/geolocation/geolocation_provider.h"
 #include "net/android/network_change_notifier_factory_android.h"
@@ skipping 41 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(AwGeolocationDelegate);
 };
 
 }  // anonymous namespace
 
 AwBrowserMainParts::AwBrowserMainParts(AwContentBrowserClient* browser_client)
     : browser_client_(browser_client) {
 }
 
 AwBrowserMainParts::~AwBrowserMainParts() {
-  breakpad::CrashDumpObserver::GetInstance()->UnregisterClient(
-      aw_browser_terminator_.get());
 }
 
 void AwBrowserMainParts::PreEarlyInitialization() {
   net::NetworkChangeNotifier::SetFactory(new AwNetworkChangeNotifierFactory());
 
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop. Also see MainMessageLoopRun.
   DCHECK(!main_message_loop_.get());
   main_message_loop_.reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
@@ skipping 17 matching lines @@
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_file_path);
   pak_file_path = pak_file_path.AppendASCII("resources.pak");
   ui::LoadMainAndroidPackFile("assets/resources.pak", pak_file_path);
 
   base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(
       base::android::AttachCurrentThread());
   DeferredGpuCommandService::SetInstance();
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess)) {
     // Create the renderers crash manager on the UI thread.
-    aw_browser_terminator_ = base::MakeUnique<AwBrowserTerminator>();
-    breakpad::CrashDumpObserver::GetInstance()->RegisterClient(
-        aw_browser_terminator_.get());
+    breakpad::CrashMicroDumpManager::GetInstance();
   }
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 void AwBrowserMainParts::PreMainMessageLoopRun() {
   browser_client_->InitBrowserContext()->PreMainMessageLoopRun();
 
   device::GeolocationProvider::SetGeolocationDelegate(
       new AwGeolocationDelegate());
 
   AwDevToolsDiscoveryProvider::Install();
 
   content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview