BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 46 insertions, 3 deletions

diff --git a/chromium/weblayer/common/crash_reporter/crash_keys.cc b/chromium/weblayer/common/crash_reporter/crash_keys.cc
index 537d47248ba..d6b82b8c9c7 100644
--- a/chromium/weblayer/common/crash_reporter/crash_keys.cc
+++ b/chromium/weblayer/common/crash_reporter/crash_keys.cc
@@ -16,6 +16,44 @@ const char kAppPackageVersionCode[] = "app-package-version-code";
 
 const char kAndroidSdkInt[] = "android-sdk-int";
 
+const char kWeblayerWebViewCompatMode[] = "WEBLAYER_WEB_VIEW_COMPAT_MODE";
+
+// clang-format off
+const char* const kWebLayerCrashKeyAllowList[] = {
+    kAppPackageName,
+    kAppPackageVersionCode,
+    kAndroidSdkInt,
+    kWeblayerWebViewCompatMode,
+
+    // process type
+    "ptype",
+
+    // Java exception stack traces
+    "exception_info",
+
+    // gpu
+    "gpu-driver",
+    "gpu-psver",
+    "gpu-vsver",
+    "gpu-gl-vendor",
+    "gpu-gl-renderer",
+    "oop_read_failure",
+
+    // content/:
+    "bad_message_reason",
+    "discardable-memory-allocated",
+    "discardable-memory-free",
+    "mojo-message-error",
+    "total-discardable-memory-allocated",
+
+    // crash keys needed for recording finch trials
+    "variations",
+    "num-experiments",
+
+    nullptr
+};
+// clang-format on
+
 }  // namespace crash_keys
 
 void SetWebLayerCrashKeys() {
diff --git a/chromium/weblayer/common/crash_reporter/crash_keys.h b/chromium/weblayer/common/crash_reporter/crash_keys.h
index 6ab374f5c1e..406d30e86eb 100644
--- a/chromium/weblayer/common/crash_reporter/crash_keys.h
+++ b/chromium/weblayer/common/crash_reporter/crash_keys.h
@@ -16,6 +16,10 @@ extern const char kAppPackageVersionCode[];
 
 extern const char kAndroidSdkInt[];
 
+extern const char kWeblayerWebViewCompatMode[];
+
+extern const char* const kWebLayerCrashKeyAllowList[];
+
 }  // namespace crash_keys
 
 void SetWebLayerCrashKeys();
diff --git a/chromium/weblayer/common/crash_reporter/crash_reporter_client.cc b/chromium/weblayer/common/crash_reporter/crash_reporter_client.cc
index 3e39d1d89de..72d7685aecb 100644
--- a/chromium/weblayer/common/crash_reporter/crash_reporter_client.cc
+++ b/chromium/weblayer/common/crash_reporter/crash_reporter_client.cc
@@ -18,6 +18,7 @@
 #include "components/version_info/android/channel_getter.h"
 #include "components/version_info/version_info.h"
 #include "components/version_info/version_info_values.h"
+#include "weblayer/common/crash_reporter/crash_keys.h"
 #include "weblayer/common/weblayer_paths.h"
 
 namespace weblayer {
@@ -44,17 +45,17 @@ class CrashReporterClientImpl : public crash_reporter::CrashReporterClient {
     return base::PathService::Get(DIR_CRASH_DUMPS, crash_dir);
   }
 
-  void GetSanitizationInformation(const char* const** annotations_whitelist,
+  void GetSanitizationInformation(const char* const** crash_key_allowlist,
                                   void** target_module,
                                   bool* sanitize_stacks) override {
-    *annotations_whitelist = nullptr;
+    *crash_key_allowlist = crash_keys::kWebLayerCrashKeyAllowList;
 #if defined(COMPONENT_BUILD)
     *target_module = nullptr;
 #else
     // The supplied address is used to identify the .so containing WebLayer.
     *target_module = reinterpret_cast<void*>(&EnableCrashReporter);
 #endif
-    *sanitize_stacks = false;
+    *sanitize_stacks = true;
   }
 
   static CrashReporterClientImpl* Get() {