Update to Chromium version 87.0.4280.66

This commit is contained in:
Marshall Greenblatt
2020-11-17 21:22:51 -05:00
parent bbf40c7646
commit 68f4b0c134
14 changed files with 43 additions and 43 deletions

View File

@@ -363,7 +363,7 @@ index e1c66df6cecf..681dd496292e 100644
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
}
diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm
index aa7c3302f2e3..c471132afe3f 100644
index eb675321436a..4e74af742ed5 100644
--- components/crash/core/app/crashpad_mac.mm
+++ components/crash/core/app/crashpad_mac.mm
@@ -16,12 +16,15 @@
@@ -412,8 +412,8 @@ index aa7c3302f2e3..c471132afe3f 100644
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Empty means stable.
@@ -62,12 +75,16 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
process_annotations["channel"] = "";
@@ -68,12 +81,16 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
process_annotations["channel"] = base::SysNSStringToUTF8(channel);
}
- NSString* version =
@@ -434,7 +434,7 @@ index aa7c3302f2e3..c471132afe3f 100644
} // @autoreleasepool
return process_annotations;
}();
@@ -127,10 +144,10 @@ base::FilePath PlatformCrashpadInitialization(
@@ -133,10 +150,10 @@ base::FilePath PlatformCrashpadInitialization(
if (initial_client) {
@autoreleasepool {
@@ -449,7 +449,7 @@ index aa7c3302f2e3..c471132afe3f 100644
// Is there a way to recover if this fails?
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
@@ -159,6 +176,12 @@ base::FilePath PlatformCrashpadInitialization(
@@ -165,6 +182,12 @@ base::FilePath PlatformCrashpadInitialization(
"--reset-own-crash-exception-port-to-system-default");
}