Refactor CrashDump*Manager to use a shared CrashDumpObserver singleton.

chromecast/browser/cast_browser_main_parts.cc

 // Copyright 2014 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 "chromecast/browser/cast_browser_main_parts.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <string>
@@ skipping 22 matching lines @@
 #include "chromecast/browser/cast_memory_pressure_monitor.h"
 #include "chromecast/browser/cast_net_log.h"
 #include "chromecast/browser/devtools/remote_debugging_server.h"
 #include "chromecast/browser/geolocation/cast_access_token_store.h"
 #include "chromecast/browser/media/media_caps_impl.h"
 #include "chromecast/browser/metrics/cast_metrics_prefs.h"
 #include "chromecast/browser/metrics/cast_metrics_service_client.h"
 #include "chromecast/browser/pref_service_helper.h"
 #include "chromecast/browser/url_request_context_factory.h"
 #include "chromecast/chromecast_features.h"
+#include "chromecast/common/global_descriptors.h"
 #include "chromecast/common/platform_client_auth.h"
 #include "chromecast/media/base/key_systems_common.h"
 #include "chromecast/media/base/media_resource_tracker.h"
 #include "chromecast/media/base/video_plane_controller.h"
 #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h"
 #include "chromecast/net/connectivity_checker.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/cast_sys_info.h"
 #include "chromecast/service/cast_service.h"
 #include "components/prefs/pref_registry_simple.h"
@@ skipping 217 matching lines @@
       media_caps_(new media::MediaCapsImpl()) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   AddDefaultCommandLineSwitches(command_line);
 
 #if !defined(OS_ANDROID)
   media_resource_tracker_ = nullptr;
 #endif  // !defined(OS_ANDROID)
 }
 
 CastBrowserMainParts::~CastBrowserMainParts() {
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID)
+  breakpad::CrashDumpObserver::GetInstance()->UnregisterClient(
+      crash_dump_manager_);
+#else
   if (media_thread_ && media_pipeline_backend_manager_) {
     // Make sure that media_pipeline_backend_manager_ is destroyed after any
     // pending media thread tasks. The CastAudioOutputStream implementation
     // calls into media_pipeline_backend_manager_ when the stream is closed;
     // therefore, we must be sure that all CastAudioOutputStreams are gone
     // before destroying media_pipeline_backend_manager_. This is guaranteed
     // once the AudioManager is destroyed; the AudioManager destruction is
     // posted to the media thread in the BrowserMainLoop destructor, just before
     // the BrowserMainParts are destroyed (ie, here). Therefore, if we delete
     // the media_pipeline_backend_manager_ using DeleteSoon on the media thread,
     // it is guaranteed that the AudioManager and all AudioOutputStreams have
     // been destroyed before media_pipeline_backend_manager_ is destroyed.
     media_thread_->task_runner()->DeleteSoon(
         FROM_HERE, media_pipeline_backend_manager_.release());
   }
-#endif  // !defined(OS_ANDROID)
+#endif  // defined(OS_ANDROID)
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 CastBrowserMainParts::GetMediaTaskRunner() {
 #if defined(OS_ANDROID)
   return nullptr;
 #else
   if (!media_thread_) {
     media_thread_.reset(new base::Thread("CastMediaThread"));
     base::Thread::Options options;
@@ skipping 72 matching lines @@
 }
 
 int CastBrowserMainParts::PreCreateThreads() {
 #if defined(OS_ANDROID)
   // GPU process is started immediately after threads are created, requiring
   // CrashDumpManager to be initialized beforehand.
   base::FilePath crash_dumps_dir;
   if (!chromecast::CrashHandler::GetCrashDumpLocation(&crash_dumps_dir)) {
     LOG(ERROR) << "Could not find crash dump location.";
   }
-  cast_browser_process_->SetCrashDumpManager(
-      base::MakeUnique<breakpad::CrashDumpManager>(crash_dumps_dir));
+  breakpad::CrashDumpObserver::Create();
+  breakpad::CrashDumpObserver::GetInstance()->RegisterClient(
+      crash_dump_manager_ = new breakpad::CrashDumpManager(

[boliu, 2016/10/13 21:07:18]

ditto

[Tobias Sargeant, 2016/12/08 16:41:41]

Done.

+          crash_dumps_dir, kAndroidMinidumpDescriptor));
 #else
   base::FilePath home_dir;
   CHECK(PathService::Get(DIR_CAST_HOME, &home_dir));
   if (!base::CreateDirectory(home_dir))
     return 1;
 
   // Hook for internal code
   cast_browser_process_->browser_client()->PreCreateThreads();
 
   // Set GL strings so GPU config code can make correct feature blacklisting/
@@ skipping 136 matching lines @@
 
 void CastBrowserMainParts::PostDestroyThreads() {
 #if !defined(OS_ANDROID)
   media_resource_tracker_->FinalizeAndDestroy();
   media_resource_tracker_ = nullptr;
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast