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

android_webview/browser/aw_content_browser_client.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_content_browser_client.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 13 matching lines @@
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/common/url_constants.h"
 #include "base/android/locale_utils.h"
 #include "base/base_paths_android.h"
 #include "base/command_line.h"
 #include "base/files/scoped_file.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "components/cdm/browser/cdm_message_filter_android.h"
-#include "components/crash/content/browser/crash_dump_observer_android.h"
+#include "components/crash/content/browser/crash_micro_dump_manager_android.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 434 matching lines @@
       int child_process_id,
       content::FileDescriptorInfo* mappings,
       std::map<int, base::MemoryMappedFile::Region>* regions) {
   int fd = ui::GetMainAndroidPackFd(
       &(*regions)[kAndroidWebViewMainPakDescriptor]);
   mappings->Share(kAndroidWebViewMainPakDescriptor, fd);
 
   fd = ui::GetLocalePackFd(&(*regions)[kAndroidWebViewLocalePakDescriptor]);
   mappings->Share(kAndroidWebViewLocalePakDescriptor, fd);
 
-  breakpad::CrashDumpObserver::GetInstance()->BrowserChildProcessStarted(
-      child_process_id, mappings);
+  base::ScopedFD crash_signal_file =
+      breakpad::CrashMicroDumpManager::GetInstance()->CreateCrashInfoChannel(
+          child_process_id);
+  if (crash_signal_file.is_valid()) {
+    mappings->Transfer(kAndroidWebViewCrashSignalDescriptor,
+                       std::move(crash_signal_file));
+  }
 }
 
 void AwContentBrowserClient::OverrideWebkitPrefs(
     content::RenderViewHost* rvh,
     content::WebPreferences* web_prefs) {
   if (!preferences_populater_.get()) {
     preferences_populater_ =
         base::WrapUnique(native_factory_->CreateWebPreferencesPopulater());
   }
   preferences_populater_->PopulateFor(
@@ skipping 17 matching lines @@
 
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
 }
 #endif
 
 }  // namespace android_webview