Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1026)

Unified Diff: content/shell/browser/shell_browser_main_parts.cc

Issue 2200693002: Refactor CrashDump*Manager to use a shared CrashDumpObserver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cast compile error Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/shell_browser_main_parts.cc
diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc
index ae1f590c1c146493f6d7103847874c94197915c8..1a6a96f209f9dcb46ef734ac9d1f054e08967cce 100644
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -19,6 +19,7 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
#include "content/public/common/url_constants.h"
+#include "content/shell/android/shell_descriptors.h"
#include "content/shell/browser/shell.h"
#include "content/shell/browser/shell_access_token_store.h"
#include "content/shell/browser/shell_browser_context.h"
@@ -37,6 +38,7 @@
#if defined(OS_ANDROID)
#include "components/crash/content/browser/crash_dump_manager_android.h"
+#include "components/crash/content/browser/crash_dump_observer_android.h"
#include "net/android/network_change_notifier_factory_android.h"
#include "net/base/network_change_notifier.h"
#endif
@@ -116,6 +118,10 @@ ShellBrowserMainParts::ShellBrowserMainParts(
ShellBrowserMainParts::~ShellBrowserMainParts() {
DCHECK(!devtools_http_handler_);
+#if defined(OS_ANDROID)
+ breakpad::CrashDumpObserver::GetInstance()->UnregisterClient(
+ crash_dump_manager_.get());
+#endif
}
#if !defined(OS_MACOSX)
@@ -173,7 +179,10 @@ int ShellBrowserMainParts::PreCreateThreads() {
base::FilePath crash_dumps_dir =
base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
switches::kCrashDumpsDir);
- crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dumps_dir));
+ crash_dump_manager_ = base::MakeUnique<breakpad::CrashDumpManager>(
+ crash_dumps_dir, kAndroidMinidumpDescriptor);
+ breakpad::CrashDumpObserver::GetInstance()->RegisterClient(
+ crash_dump_manager_.get());
}
return 0;

Powered by Google App Engine
This is Rietveld 408576698