| Index: components/crash/app/breakpad_mac.mm
|
| diff --git a/components/crash/app/breakpad_mac.mm b/components/crash/app/breakpad_mac.mm
|
| index 9f617398f1939cedc13a6113c767beee658883d8..80431f79d7baa2acc048e2a809c0bb7bf9622ecc 100644
|
| --- a/components/crash/app/breakpad_mac.mm
|
| +++ b/components/crash/app/breakpad_mac.mm
|
| @@ -24,7 +24,9 @@
|
| #include "base/threading/platform_thread.h"
|
| #include "base/threading/thread_restrictions.h"
|
| #import "breakpad/src/client/mac/Framework/Breakpad.h"
|
| -#include "components/crash/app/breakpad_client.h"
|
| +#include "components/crash/app/crash_reporter_client.h"
|
| +
|
| +using crash_reporter::GetCrashReporterClient;
|
|
|
| namespace breakpad {
|
|
|
| @@ -166,12 +168,13 @@ void InitCrashReporter(const std::string& process_type) {
|
| if (is_browser) {
|
| // Since the configuration management infrastructure is possibly not
|
| // initialized when this code runs, read the policy preference directly.
|
| - if (!GetBreakpadClient()->ReportingIsEnforcedByPolicy(&enable_breakpad)) {
|
| + if (!GetCrashReporterClient()->ReportingIsEnforcedByPolicy(
|
| + &enable_breakpad)) {
|
| // Controlled by the user. The crash reporter may be enabled by
|
| // preference or through an environment variable, but the kDisableBreakpad
|
| // switch overrides both.
|
| - enable_breakpad = GetBreakpadClient()->GetCollectStatsConsent() ||
|
| - GetBreakpadClient()->IsRunningUnattended();
|
| + enable_breakpad = GetCrashReporterClient()->GetCollectStatsConsent() ||
|
| + GetCrashReporterClient()->IsRunningUnattended();
|
| enable_breakpad &= !command_line->HasSwitch(switches::kDisableBreakpad);
|
| }
|
| } else {
|
| @@ -214,7 +217,7 @@ void InitCrashReporter(const std::string& process_type) {
|
| [breakpad_config setObject:@"NO" forKey:@BREAKPAD_SEND_AND_EXIT];
|
|
|
| base::FilePath dir_crash_dumps;
|
| - GetBreakpadClient()->GetCrashDumpLocation(&dir_crash_dumps);
|
| + GetCrashReporterClient()->GetCrashDumpLocation(&dir_crash_dumps);
|
| [breakpad_config setObject:base::SysUTF8ToNSString(dir_crash_dumps.value())
|
| forKey:@BREAKPAD_DUMP_DIRECTORY];
|
|
|
| @@ -236,7 +239,7 @@ void InitCrashReporter(const std::string& process_type) {
|
| // Initialize the scoped crash key system.
|
| base::debug::SetCrashKeyReportingFunctions(&SetCrashKeyValueImpl,
|
| &ClearCrashKeyValueImpl);
|
| - GetBreakpadClient()->RegisterCrashKeys();
|
| + GetCrashReporterClient()->RegisterCrashKeys();
|
|
|
| // Set Breakpad metadata values. These values are added to Info.plist during
|
| // the branded Google Chrome.app build.
|
| @@ -248,7 +251,7 @@ void InitCrashReporter(const std::string& process_type) {
|
| // Get the guid from the command line switch.
|
| std::string client_guid =
|
| command_line->GetSwitchValueASCII(switches::kEnableCrashReporter);
|
| - GetBreakpadClient()->SetBreakpadClientIdFromGUID(client_guid);
|
| + GetCrashReporterClient()->SetCrashReporterClientIdFromGUID(client_guid);
|
| }
|
|
|
| logging::SetLogMessageHandler(&FatalMessageHandler);
|
| @@ -274,7 +277,7 @@ void InitCrashProcessInfo(const std::string& process_type_switch) {
|
| process_type = base::SysUTF8ToNSString(process_type_switch);
|
| }
|
|
|
| - GetBreakpadClient()->InstallAdditionalFilters(gBreakpadRef);
|
| + GetCrashReporterClient()->InstallAdditionalFilters(gBreakpadRef);
|
|
|
| // Store process type in crash dump.
|
| SetCrashKeyValue(@"ptype", process_type);
|
|
|