0

[Chromoting] Rename REMOTING_ENABLE_BREAKPAD to ..._CRASH_REPORTING

Change-Id: I457c3e0b410bc3b350fd822935770043eb0dd919
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6179196
Reviewed-by: Joe Downing <joedow@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1409635}
This commit is contained in:
Gary Kacmarcik
2025-01-22 06:51:22 -08:00
committed by Chromium LUCI CQ
parent 21f256fe86
commit f123d8648d
9 changed files with 25 additions and 25 deletions

@ -40,7 +40,7 @@ config("host_implementation") {
defines += [ "HOST_IMPLEMENTATION" ]
if (is_chrome_branded && is_official_build) {
defines += [ "REMOTING_ENABLE_BREAKPAD" ]
defines += [ "REMOTING_ENABLE_CRASH_REPORTING" ]
}
}
if (is_win) {

@ -217,10 +217,10 @@ int HostMain(int argc, char** argv) {
// Enable debug logs.
InitHostLogging();
#if defined(REMOTING_ENABLE_BREAKPAD)
// Initialize Breakpad as early as possible. On Mac the command-line needs to
// be initialized first, so that the preference for crash-reporting can be
// looked up in the config file.
#if defined(REMOTING_ENABLE_CRASH_REPORTING)
// Initialize crash reporting as early as possible. On Mac the command-line
// needs to be initialized first, so that the preference for crash-reporting
// can be looked up in the config file.
// Note that we enable crash reporting only if the user has opted in to having
// the crash reports uploaded.
if (IsUsageStatsAllowed()) {
@ -237,7 +237,7 @@ int HostMain(int argc, char** argv) {
}
#endif
}
#endif // defined(REMOTING_ENABLE_BREAKPAD)
#endif // defined(REMOTING_ENABLE_CRASH_REPORTING)
#if BUILDFLAG(IS_WIN)
// Register and initialize common controls.

@ -99,14 +99,14 @@ int It2MeNativeMessagingHostMain(int argc, char** argv) {
base::apple::ScopedNSAutoreleasePool pool;
#endif // BUILDFLAG(IS_APPLE)
#if defined(REMOTING_ENABLE_BREAKPAD)
// Initialize Breakpad as early as possible. On Mac the command-line needs to
// be initialized first, so that the preference for crash-reporting can be
// looked up in the config file.
#if defined(REMOTING_ENABLE_CRASH_REPORTING)
// Initialize crash reporting as early as possible. On Mac the command-line
// needs to be initialized first, so that the preference for crash-reporting
// can be looked up in the config file.
if (IsUsageStatsAllowed()) {
InitializeCrashReporting();
}
#endif // defined(REMOTING_ENABLE_BREAKPAD)
#endif // defined(REMOTING_ENABLE_CRASH_REPORTING)
#if BUILDFLAG(IS_WIN)
// Register and initialize common controls.

@ -159,7 +159,7 @@ target("mac_app_bundle", "remoting_me2me_host") {
# TODO(joedow): Re-enable or replace with Crashpad: crbug.com/637884.
# if (is_chrome_branded && is_official_build) {
# defines = [ "REMOTING_ENABLE_BREAKPAD" ]
# defines = [ "REMOTING_ENABLE_CRASH_REPORTING" ]
# }
deps = [

@ -37,11 +37,11 @@ int RemoteOpenUrlMain(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
InitHostLogging();
#if defined(REMOTING_ENABLE_BREAKPAD)
#if defined(REMOTING_ENABLE_CRASH_REPORTING)
if (IsUsageStatsAllowed()) {
InitializeCrashReporting();
}
#endif // defined(REMOTING_ENABLE_BREAKPAD)
#endif // defined(REMOTING_ENABLE_CRASH_REPORTING)
if (!ChromotingHostServicesClient::Initialize()) {
return kInitializationFailed;

@ -90,11 +90,11 @@ int RemoteSecurityKeyMain(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
remoting::InitHostLogging();
#if defined(REMOTING_ENABLE_BREAKPAD)
#if defined(REMOTING_ENABLE_CRASH_REPORTING)
if (IsUsageStatsAllowed()) {
InitializeCrashReporting();
}
#endif // defined(REMOTING_ENABLE_BREAKPAD)
#endif // defined(REMOTING_ENABLE_CRASH_REPORTING)
return StartRemoteSecurityKey();
}

@ -91,14 +91,14 @@ int Me2MeNativeMessagingHostMain(int argc, char** argv) {
// Required to find the ICU data file, used by some file_util routines.
base::i18n::InitializeICU();
#if defined(REMOTING_ENABLE_BREAKPAD)
// Initialize Breakpad as early as possible. On Mac the command-line needs to
// be initialized first, so that the preference for crash-reporting can be
// looked up in the config file.
#if defined(REMOTING_ENABLE_CRASH_REPORTING)
// Initialize crash reporting as early as possible. On Mac the command-line
// needs to be initialized first, so that the preference for crash-reporting
// can be looked up in the config file.
if (IsUsageStatsAllowed()) {
InitializeCrashReporting();
}
#endif // defined(REMOTING_ENABLE_BREAKPAD)
#endif // defined(REMOTING_ENABLE_CRASH_REPORTING)
base::ThreadPoolInstance::CreateAndStartWithDefaultParams("Me2Me");

@ -440,13 +440,13 @@ int StartHostMain(int argc, char** argv) {
return 1;
}
#if defined(REMOTING_ENABLE_BREAKPAD)
#if defined(REMOTING_ENABLE_CRASH_REPORTING)
// We don't have a config file yet so we can't use IsUsageStatsAllowed(),
// instead we can just check the command line parameter.
if (params.enable_crash_reporting) {
InitializeCrashReporting();
}
#endif // defined(REMOTING_ENABLE_BREAKPAD)
#endif // defined(REMOTING_ENABLE_CRASH_REPORTING)
// Provide SingleThreadTaskExecutor and threads for the
// URLRequestContextGetter.

@ -43,11 +43,11 @@ int RemoteWebAuthnMain(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
InitHostLogging();
#if defined(REMOTING_ENABLE_BREAKPAD)
#if defined(REMOTING_ENABLE_CRASH_REPORTING)
if (IsUsageStatsAllowed()) {
InitializeCrashReporting();
}
#endif // defined(REMOTING_ENABLE_BREAKPAD)
#endif // defined(REMOTING_ENABLE_CRASH_REPORTING)
if (!IsLaunchedByTrustedProcess()) {
LOG(ERROR) << "Current process is not launched by a trusted process.";