From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 12 Oct 2020 14:27:29 +0200
Subject: BASELINE: Update Chromium to 85.0.4183.140

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 chromium/components/resources/BUILD.gn             |   1 +
 .../android/blocked_content_resource_id.h          |  27 +++++++++++++++++++++
 .../components/resources/android/theme_resources.h |   1 +
 .../android_system_error_page_resources.grdp       |   2 +-
 ...l_and_password_manager_internals_resources.grdp |   8 +++---
 .../resources/components_scaled_resources.grd      |   2 ++
 chromium/components/resources/crash_resources.grdp |   4 +--
 .../resources/default_100_percent/sadplugin.png    | Bin 0 -> 238 bytes
 .../default_100_percent/webview-crash.png          | Bin 0 -> 153 bytes
 .../resources/default_200_percent/sadplugin.png    | Bin 0 -> 321 bytes
 .../default_200_percent/webview-crash.png          | Bin 0 -> 187 bytes
 .../resources/dom_distiller_resources.grdp         |  14 +++++------
 .../components/resources/flags_ui_resources.grdp   |   6 ++---
 .../components/resources/gcm_driver_resources.grdp |   6 ++---
 .../components/resources/net_log_resources.grdp    |   4 +--
 .../components/resources/neterror_resources.grdp   |   2 +-
 .../resources/ntp_tiles_dev_ui_resources.grdp      |   9 +++----
 .../resources/offline_pages_resources.grdp         |   2 +-
 .../components/resources/policy_resources.grdp     |   8 +++---
 .../components/resources/printing_resources.grdp   |   2 +-
 .../resources/safe_browsing_resources.grdp         |   6 ++---
 .../security_interstitials_dev_ui_resources.grdp   |   1 -
 .../security_interstitials_resources.grdp          |  18 +++++++-------
 .../components/resources/signin_resources.grdp     |   4 +--
 .../components/resources/translate_resources.grdp  |   2 +-
 .../resources/user_actions_ui_resources.grdp       |   6 ++---
 .../components/resources/version_ui_resources.grdp |   6 ++---
 27 files changed, 84 insertions(+), 57 deletions(-)
 create mode 100644 chromium/components/resources/android/blocked_content_resource_id.h
 create mode 100644 chromium/components/resources/default_100_percent/sadplugin.png
 create mode 100644 chromium/components/resources/default_100_percent/webview-crash.png
 create mode 100644 chromium/components/resources/default_200_percent/sadplugin.png
 create mode 100644 chromium/components/resources/default_200_percent/webview-crash.png

(limited to 'chromium/components/resources')

diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn
index 49a0480f3b7..a5dc084e084 100644
--- a/chromium/components/resources/BUILD.gn
+++ b/chromium/components/resources/BUILD.gn
@@ -108,6 +108,7 @@ action("about_credits") {
 if (is_android) {
   source_set("android_resources") {
     sources = [
+      "android/blocked_content_resource_id.h",
       "android/page_info_resource_id.h",
       "android/permissions_resource_id.h",
       "android/theme_resources.h",
diff --git a/chromium/components/resources/android/blocked_content_resource_id.h b/chromium/components/resources/android/blocked_content_resource_id.h
new file mode 100644
index 00000000000..aa1e9cd9d2d
--- /dev/null
+++ b/chromium/components/resources/android/blocked_content_resource_id.h
@@ -0,0 +1,27 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file maps resource IDs to Android resource IDs.
+
+// Presence of regular include guards is checked by:
+// 1. cpplint
+// 2. a custom presubmit in src/PRESUBMIT.py
+// 3. clang (but it only checks the guard is correct if present)
+// Disable the first two with these magic comments:
+// NOLINT(build/header_guard)
+// no-include-guard-because-multiply-included
+
+// LINK_RESOURCE_ID is used for IDs that come from a .grd file.
+#ifndef LINK_RESOURCE_ID
+#error "LINK_RESOURCE_ID should be defined before including this file"
+#endif
+// DECLARE_RESOURCE_ID is used for IDs that don't have .grd entries, and
+// are only declared in this file.
+#ifndef DECLARE_RESOURCE_ID
+#error "DECLARE_RESOURCE_ID should be defined before including this file"
+#endif
+
+// InfoBar resources.
+DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_BLOCKED_POPUPS,
+                    R.drawable.infobar_blocked_popups)
diff --git a/chromium/components/resources/android/theme_resources.h b/chromium/components/resources/android/theme_resources.h
index a84712ddf37..b48a7a50a5f 100644
--- a/chromium/components/resources/android/theme_resources.h
+++ b/chromium/components/resources/android/theme_resources.h
@@ -14,6 +14,7 @@ enum {
   // Not used; just provides a starting value for the enum. These must
   // not conflict with IDR_* values, which top out at 2^16 - 1.
   ANDROID_COMPONENTS_RESOURCE_ID_NONE = 1 << 16,
+#include "components/resources/android/blocked_content_resource_id.h"
 #include "components/resources/android/page_info_resource_id.h"
 #include "components/resources/android/permissions_resource_id.h"
   ANDROID_COMPONENTS_RESOURCE_ID_MAX,
diff --git a/chromium/components/resources/android_system_error_page_resources.grdp b/chromium/components/resources/android_system_error_page_resources.grdp
index 88b7394ce8d..78fda031426 100644
--- a/chromium/components/resources/android_system_error_page_resources.grdp
+++ b/chromium/components/resources/android_system_error_page_resources.grdp
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_ANDROID_ERROR_PAGE_LOAD_ERROR_HTML" file="../android_system_error_page/resources/load_error.html" flattenhtml="true" type="BINDATA" compress="gzip" />
+  <include name="IDR_ANDROID_ERROR_PAGE_LOAD_ERROR_HTML" file="../android_system_error_page/resources/load_error.html" flattenhtml="true" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/autofill_and_password_manager_internals_resources.grdp b/chromium/components/resources/autofill_and_password_manager_internals_resources.grdp
index 92b02584efd..5fe4bb86529 100644
--- a/chromium/components/resources/autofill_and_password_manager_internals_resources.grdp
+++ b/chromium/components/resources/autofill_and_password_manager_internals_resources.grdp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grit-part>
   <if expr="not is_ios">
-    <include name="IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_HTML" file="../autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
+    <include name="IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_HTML" file="../autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
   </if>
   <if expr="is_ios">
-    <include name="IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_HTML" file="../autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals_ios.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
+    <include name="IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_HTML" file="../autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals_ios.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
   </if>
-  <include name="IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_JS" file="../autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" />
-  <include name="IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_CSS" file="../autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" />
+  <include name="IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_JS" file="../autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.js" flattenhtml="true" type="BINDATA" />
+  <include name="IDR_AUTOFILL_AND_PASSWORD_MANAGER_INTERNALS_CSS" file="../autofill/core/browser/autofill_and_password_manager_internals/autofill_and_password_manager_internals.css" flattenhtml="true" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/components_scaled_resources.grd b/chromium/components/resources/components_scaled_resources.grd
index a58807f06fd..b642c754007 100644
--- a/chromium/components/resources/components_scaled_resources.grd
+++ b/chromium/components/resources/components_scaled_resources.grd
@@ -21,6 +21,8 @@
 
       <!-- Generic resources -->
       <structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="favicon_history.png" />
+      <structure type="chrome_scaled_image" name="IDR_SAD_WEBVIEW" file="webview-crash.png" />
+      <structure type="chrome_scaled_image" name="IDR_SAD_PLUGIN" file="sadplugin.png" />
     </structures>
   </release>
 </grit>
diff --git a/chromium/components/resources/crash_resources.grdp b/chromium/components/resources/crash_resources.grdp
index f7a3614bf0f..735b213f310 100644
--- a/chromium/components/resources/crash_resources.grdp
+++ b/chromium/components/resources/crash_resources.grdp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_CRASH_CRASHES_HTML" file="../crash/core/browser/resources/crashes.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_CRASH_CRASHES_JS" file="../crash/core/browser/resources/crashes.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_CRASH_CRASHES_HTML" file="../crash/core/browser/resources/crashes.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+  <include name="IDR_CRASH_CRASHES_JS" file="../crash/core/browser/resources/crashes.js" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/default_100_percent/sadplugin.png b/chromium/components/resources/default_100_percent/sadplugin.png
new file mode 100644
index 00000000000..9ad1225ac67
Binary files /dev/null and b/chromium/components/resources/default_100_percent/sadplugin.png differ
diff --git a/chromium/components/resources/default_100_percent/webview-crash.png b/chromium/components/resources/default_100_percent/webview-crash.png
new file mode 100644
index 00000000000..0ce1db18805
Binary files /dev/null and b/chromium/components/resources/default_100_percent/webview-crash.png differ
diff --git a/chromium/components/resources/default_200_percent/sadplugin.png b/chromium/components/resources/default_200_percent/sadplugin.png
new file mode 100644
index 00000000000..78286797176
Binary files /dev/null and b/chromium/components/resources/default_200_percent/sadplugin.png differ
diff --git a/chromium/components/resources/default_200_percent/webview-crash.png b/chromium/components/resources/default_200_percent/webview-crash.png
new file mode 100644
index 00000000000..eeb34b253a6
Binary files /dev/null and b/chromium/components/resources/default_200_percent/webview-crash.png differ
diff --git a/chromium/components/resources/dom_distiller_resources.grdp b/chromium/components/resources/dom_distiller_resources.grdp
index dfbcad2b90a..3e2f084671f 100644
--- a/chromium/components/resources/dom_distiller_resources.grdp
+++ b/chromium/components/resources/dom_distiller_resources.grdp
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_DOM_DISTILLER_VIEWER_HTML" file="../dom_distiller/core/html/dom_distiller_viewer.html" type="BINDATA" compress="gzip" />
-  <include name="IDR_DOM_DISTILLER_VIEWER_JS" file="../dom_distiller/core/javascript/dom_distiller_viewer.js" type="BINDATA" compress="gzip" />
-  <include name="IDR_DISTILLER_JS" file="../dom_distiller/core/javascript/domdistiller.js" flattenhtml="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpage.css" type="BINDATA" compress="gzip" preprocess="true"/>
-  <include name="IDR_DISTILLER_DESKTOP_CSS" file="../dom_distiller/core/css/distilledpage_desktop.css" type="BINDATA" compress="gzip" />
-  <include name="IDR_DISTILLER_LOADING_IMAGE" file="../dom_distiller/core/images/dom_distiller_material_spinner.svg" type="BINDATA" compress="gzip" />
-  <include name="IDR_EXTRACT_PAGE_FEATURES_JS" file="../dom_distiller/core/javascript/extract_features.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_DOM_DISTILLER_VIEWER_HTML" file="../dom_distiller/core/html/dom_distiller_viewer.html" type="BINDATA" />
+  <include name="IDR_DOM_DISTILLER_VIEWER_JS" file="../dom_distiller/core/javascript/dom_distiller_viewer.js" type="BINDATA" />
+  <include name="IDR_DISTILLER_JS" file="../dom_distiller/core/javascript/domdistiller.js" flattenhtml="true" type="BINDATA" />
+  <include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpage.css" type="BINDATA" preprocess="true"/>
+  <include name="IDR_DISTILLER_DESKTOP_CSS" file="../dom_distiller/core/css/distilledpage_desktop.css" type="BINDATA" />
+  <include name="IDR_DISTILLER_LOADING_IMAGE" file="../dom_distiller/core/images/dom_distiller_material_spinner.svg" type="BINDATA" />
+  <include name="IDR_EXTRACT_PAGE_FEATURES_JS" file="../dom_distiller/core/javascript/extract_features.js" type="BINDATA" />
   <include name="IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL_NEW" file="../dom_distiller/core/data/distillable_page_model_new.bin" type="BINDATA" compress="gzip" />
   <include name="IDR_LONG_PAGE_SERIALIZED_MODEL" file="../dom_distiller/core/data/long_page_model.bin" type="BINDATA" compress="gzip" />
 </grit-part>
diff --git a/chromium/components/resources/flags_ui_resources.grdp b/chromium/components/resources/flags_ui_resources.grdp
index 858385db31a..6dbb7003da1 100644
--- a/chromium/components/resources/flags_ui_resources.grdp
+++ b/chromium/components/resources/flags_ui_resources.grdp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_FLAGS_UI_FLAGS_HTML" file="../flags_ui/resources/flags.html" preprocess="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_FLAGS_UI_FLAGS_JS" file="../flags_ui/resources/flags.js" type="BINDATA" compress="gzip" />
-  <include name="IDR_FLAGS_UI_FLAGS_CSS" file="../flags_ui/resources/flags.css" flattenhtml="true" type="BINDATA" compress="gzip" />
+  <include name="IDR_FLAGS_UI_FLAGS_HTML" file="../flags_ui/resources/flags.html" preprocess="true" type="BINDATA" />
+  <include name="IDR_FLAGS_UI_FLAGS_JS" file="../flags_ui/resources/flags.js" type="BINDATA" />
+  <include name="IDR_FLAGS_UI_FLAGS_CSS" file="../flags_ui/resources/flags.css" flattenhtml="true" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/gcm_driver_resources.grdp b/chromium/components/resources/gcm_driver_resources.grdp
index a35430ebe77..5ab55e32d69 100644
--- a/chromium/components/resources/gcm_driver_resources.grdp
+++ b/chromium/components/resources/gcm_driver_resources.grdp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_GCM_DRIVER_GCM_INTERNALS_HTML" file="../gcm_driver/resources/gcm_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" />
-  <include name="IDR_GCM_DRIVER_GCM_INTERNALS_CSS" file="../gcm_driver/resources/gcm_internals.css" compress="gzip" type="BINDATA" />
-  <include name="IDR_GCM_DRIVER_GCM_INTERNALS_JS" file="../gcm_driver/resources/gcm_internals.js" compress="gzip" type="BINDATA" />
+  <include name="IDR_GCM_DRIVER_GCM_INTERNALS_HTML" file="../gcm_driver/resources/gcm_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+  <include name="IDR_GCM_DRIVER_GCM_INTERNALS_CSS" file="../gcm_driver/resources/gcm_internals.css" type="BINDATA" />
+  <include name="IDR_GCM_DRIVER_GCM_INTERNALS_JS" file="../gcm_driver/resources/gcm_internals.js" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/net_log_resources.grdp b/chromium/components/resources/net_log_resources.grdp
index 4d504c4227e..34e88e4d8bd 100644
--- a/chromium/components/resources/net_log_resources.grdp
+++ b/chromium/components/resources/net_log_resources.grdp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_NET_LOG_NET_EXPORT_HTML" file="../net_log/resources/net_export.html" flattenhtml="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_NET_LOG_NET_EXPORT_JS" file="../net_log/resources/net_export.js" flattenhtml="true" type="BINDATA" compress="gzip" />
+  <include name="IDR_NET_LOG_NET_EXPORT_HTML" file="../net_log/resources/net_export.html" flattenhtml="true" type="BINDATA" />
+  <include name="IDR_NET_LOG_NET_EXPORT_JS" file="../net_log/resources/net_export.js" flattenhtml="true" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/neterror_resources.grdp b/chromium/components/resources/neterror_resources.grdp
index db567c617a5..d13a11bfa2f 100644
--- a/chromium/components/resources/neterror_resources.grdp
+++ b/chromium/components/resources/neterror_resources.grdp
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_NET_ERROR_HTML" file="../neterror/resources/neterror.html" flattenhtml="true" type="BINDATA" compress="gzip"/>
+  <include name="IDR_NET_ERROR_HTML" file="../neterror/resources/neterror.html" flattenhtml="true" type="BINDATA"/>
 </grit-part>
diff --git a/chromium/components/resources/ntp_tiles_dev_ui_resources.grdp b/chromium/components/resources/ntp_tiles_dev_ui_resources.grdp
index 93ee50fab88..03f106f608f 100644
--- a/chromium/components/resources/ntp_tiles_dev_ui_resources.grdp
+++ b/chromium/components/resources/ntp_tiles_dev_ui_resources.grdp
@@ -5,14 +5,11 @@
            file="../ntp_tiles/webui/resources/ntp_tiles_internals.html"
            flattenhtml="true"
            allowexternalscript="true"
-           type="BINDATA"
-           compress="gzip" />
+           type="BINDATA" />
   <include name="IDR_NTP_TILES_INTERNALS_JS"
            file="../ntp_tiles/webui/resources/ntp_tiles_internals.js"
-           type="BINDATA"
-           compress="gzip" />
+           type="BINDATA" />
   <include name="IDR_NTP_TILES_INTERNALS_CSS"
            file="../ntp_tiles/webui/resources/ntp_tiles_internals.css"
-           type="BINDATA"
-           compress="gzip" />
+           type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/offline_pages_resources.grdp b/chromium/components/resources/offline_pages_resources.grdp
index 3179830095c..28388eec6d2 100644
--- a/chromium/components/resources/offline_pages_resources.grdp
+++ b/chromium/components/resources/offline_pages_resources.grdp
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_OFFLINE_PAGES_RENOVATIONS_JS" file="../offline_pages/resources/renovations.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_OFFLINE_PAGES_RENOVATIONS_JS" file="../offline_pages/resources/renovations.js" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/policy_resources.grdp b/chromium/components/resources/policy_resources.grdp
index 459dbcfc322..ec7fc0fdc11 100644
--- a/chromium/components/resources/policy_resources.grdp
+++ b/chromium/components/resources/policy_resources.grdp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_POLICY_CSS" file="../policy/resources/webui/policy.css" preprocess="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_POLICY_HTML" file="../policy/resources/webui/policy.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_POLICY_BASE_JS" file="../policy/resources/webui/policy_base.js" type="BINDATA" compress="gzip" preprocess="true" />
-  <include name="IDR_POLICY_JS" file="../policy/resources/webui/policy.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_POLICY_CSS" file="../policy/resources/webui/policy.css" preprocess="true" type="BINDATA" />
+  <include name="IDR_POLICY_HTML" file="../policy/resources/webui/policy.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+  <include name="IDR_POLICY_BASE_JS" file="../policy/resources/webui/policy_base.js" type="BINDATA" preprocess="true" />
+  <include name="IDR_POLICY_JS" file="../policy/resources/webui/policy.js" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/printing_resources.grdp b/chromium/components/resources/printing_resources.grdp
index c50a1025d5e..27a993ee20b 100644
--- a/chromium/components/resources/printing_resources.grdp
+++ b/chromium/components/resources/printing_resources.grdp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
   <if expr="enable_basic_printing">
-    <include name="IDR_PRINT_HEADER_FOOTER_TEMPLATE_PAGE" file="../printing/resources/print_header_footer_template_page.html" flattenhtml="true" allowexternalscript="false" type="BINDATA" compress="gzip" />
+    <include name="IDR_PRINT_HEADER_FOOTER_TEMPLATE_PAGE" file="../printing/resources/print_header_footer_template_page.html" flattenhtml="true" allowexternalscript="false" type="BINDATA" />
   </if>
 </grit-part>
diff --git a/chromium/components/resources/safe_browsing_resources.grdp b/chromium/components/resources/safe_browsing_resources.grdp
index dd59e8d61a1..3e255c60dbe 100644
--- a/chromium/components/resources/safe_browsing_resources.grdp
+++ b/chromium/components/resources/safe_browsing_resources.grdp
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-    <include name="IDR_SAFE_BROWSING_HTML" file="..\..\components\safe_browsing\content\web_ui\resources\safe_browsing.html" type="BINDATA" compress="gzip" />
-    <include name="IDR_SAFE_BROWSING_CSS" file="..\..\components\safe_browsing\content\web_ui\resources\safe_browsing.css" type="BINDATA" compress="gzip" />
-    <include name="IDR_SAFE_BROWSING_JS" file="..\..\components\safe_browsing\content\web_ui\resources\safe_browsing.js" type="BINDATA" compress="gzip" />
+    <include name="IDR_SAFE_BROWSING_HTML" file="..\..\components\safe_browsing\content\web_ui\resources\safe_browsing.html" type="BINDATA" />
+    <include name="IDR_SAFE_BROWSING_CSS" file="..\..\components\safe_browsing\content\web_ui\resources\safe_browsing.css" type="BINDATA" />
+    <include name="IDR_SAFE_BROWSING_JS" file="..\..\components\safe_browsing\content\web_ui\resources\safe_browsing.js" type="BINDATA" />
   <!-- TODO(crbug/1056278): Enable this on Fuchsia -->
   <if expr="safe_browsing_mode != 0 and not is_fuchsia">
     <include name="IDR_DOWNLOAD_FILE_TYPES_PB" file="${root_gen_dir}\components\safe_browsing\core\resources\download_file_types.pb" use_base_dir="false" type="BINDATA" compress="gzip" />
diff --git a/chromium/components/resources/security_interstitials_dev_ui_resources.grdp b/chromium/components/resources/security_interstitials_dev_ui_resources.grdp
index d15f1f8c964..7a8e4204473 100644
--- a/chromium/components/resources/security_interstitials_dev_ui_resources.grdp
+++ b/chromium/components/resources/security_interstitials_dev_ui_resources.grdp
@@ -3,7 +3,6 @@
 <grit-part>
   <include name="IDR_SECURITY_INTERSTITIAL_UI_HTML"
            file="../security_interstitials/core/browser/resources/list_of_interstitials.html"
-           compress="gzip"
            flattenhtml="true"
            type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/security_interstitials_resources.grdp b/chromium/components/resources/security_interstitials_resources.grdp
index 26055aa5fbf..6dbd6c9e324 100644
--- a/chromium/components/resources/security_interstitials_resources.grdp
+++ b/chromium/components/resources/security_interstitials_resources.grdp
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Resources for user-facing security interstitial pages. -->
 <grit-part>
-  <include name="IDR_SECURITY_INTERSTITIAL_COMMON_CSS" file="../security_interstitials/core/common/resources/interstitial_common.css" compress="gzip" type="BINDATA" />
-  <include name="IDR_SECURITY_INTERSTITIAL_CORE_CSS" file="../security_interstitials/core/common/resources/interstitial_core.css" compress="gzip" type="BINDATA" />
-  <include name="IDR_SECURITY_INTERSTITIAL_HTML" file="../security_interstitials/core/browser/resources/interstitial_large.html" compress="gzip" flattenhtml="true" type="BINDATA"/>
-  <include name="IDR_SECURITY_INTERSTITIAL_QUIET_HTML" file="../security_interstitials/core/browser/resources/interstitial_webview_quiet.html" compress="gzip" flattenhtml="true" type="BINDATA" />
-  <include name="IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_HTML" file="../security_interstitials/content/resources/connection_help.html" compress="gzip" type="BINDATA" />
-  <include name="IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_CSS" file="../security_interstitials/content/resources/connection_help.css" compress="gzip" type="BINDATA" />
-  <include name="IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_JS" file="../security_interstitials/content/resources/connection_help.js" compress="gzip" type="BINDATA" />
-  <include name="IDR_KNOWN_INTERCEPTION_HTML" file="../security_interstitials/content/resources/known_interception_disclosure.html" compress="gzip" type="BINDATA" />
-  <include name="IDR_KNOWN_INTERCEPTION_CSS" file="../security_interstitials/content/resources/known_interception_disclosure.css" compress="gzip" type="BINDATA" />
+  <include name="IDR_SECURITY_INTERSTITIAL_COMMON_CSS" file="../security_interstitials/core/common/resources/interstitial_common.css" type="BINDATA" />
+  <include name="IDR_SECURITY_INTERSTITIAL_CORE_CSS" file="../security_interstitials/core/common/resources/interstitial_core.css" type="BINDATA" />
+  <include name="IDR_SECURITY_INTERSTITIAL_HTML" file="../security_interstitials/core/browser/resources/interstitial_large.html" flattenhtml="true" type="BINDATA"/>
+  <include name="IDR_SECURITY_INTERSTITIAL_QUIET_HTML" file="../security_interstitials/core/browser/resources/interstitial_webview_quiet.html" flattenhtml="true" type="BINDATA" />
+  <include name="IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_HTML" file="../security_interstitials/content/resources/connection_help.html" type="BINDATA" />
+  <include name="IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_CSS" file="../security_interstitials/content/resources/connection_help.css" type="BINDATA" />
+  <include name="IDR_SECURITY_INTERSTITIAL_CONNECTION_HELP_JS" file="../security_interstitials/content/resources/connection_help.js" type="BINDATA" />
+  <include name="IDR_KNOWN_INTERCEPTION_HTML" file="../security_interstitials/content/resources/known_interception_disclosure.html" type="BINDATA" />
+  <include name="IDR_KNOWN_INTERCEPTION_CSS" file="../security_interstitials/content/resources/known_interception_disclosure.css" type="BINDATA" />
   <include name="IDR_KNOWN_INTERCEPTION_ICON_1X_PNG" file="../security_interstitials/core/browser/resources/images/1x/triangle_red.png" compress="gzip" type="BINDATA" />
   <include name="IDR_KNOWN_INTERCEPTION_ICON_2X_PNG" file="../security_interstitials/core/browser/resources/images/2x/triangle_red.png" compress="gzip" type="BINDATA" />
 
diff --git a/chromium/components/resources/signin_resources.grdp b/chromium/components/resources/signin_resources.grdp
index 28afaf36fbd..7f47e820113 100644
--- a/chromium/components/resources/signin_resources.grdp
+++ b/chromium/components/resources/signin_resources.grdp
@@ -2,9 +2,9 @@
 <grit-part>
   <include name="IDR_SIGNIN_INTERNALS_INDEX_HTML"
     file="../signin/core/browser/resources/signin_index.html"
-    flattenhtml="true" allowexternalscript="true" compress="gzip"
+    flattenhtml="true" allowexternalscript="true"
     type="BINDATA" />
   <include name="IDR_SIGNIN_INTERNALS_INDEX_JS"
     file="../signin/core/browser/resources/signin_internals.js"
-    compress="gzip" type="BINDATA" />
+    type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/translate_resources.grdp b/chromium/components/resources/translate_resources.grdp
index 0a040331e67..5226e140218 100644
--- a/chromium/components/resources/translate_resources.grdp
+++ b/chromium/components/resources/translate_resources.grdp
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_TRANSLATE_JS" file="../translate/core/browser/resources/translate.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_TRANSLATE_JS" file="../translate/core/browser/resources/translate.js" type="BINDATA" />
 </grit-part>
diff --git a/chromium/components/resources/user_actions_ui_resources.grdp b/chromium/components/resources/user_actions_ui_resources.grdp
index e0f0975a0a5..b91eb8ec797 100644
--- a/chromium/components/resources/user_actions_ui_resources.grdp
+++ b/chromium/components/resources/user_actions_ui_resources.grdp
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_USER_ACTIONS_CSS" file="../user_actions_ui/resources/user_actions.css" type="BINDATA" compress="gzip" />
-  <include name="IDR_USER_ACTIONS_HTML" file="../user_actions_ui/resources/user_actions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_USER_ACTIONS_JS" file="../user_actions_ui/resources/user_actions.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_USER_ACTIONS_CSS" file="../user_actions_ui/resources/user_actions.css" type="BINDATA" />
+  <include name="IDR_USER_ACTIONS_HTML" file="../user_actions_ui/resources/user_actions.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+  <include name="IDR_USER_ACTIONS_JS" file="../user_actions_ui/resources/user_actions.js" type="BINDATA" />
 </grit-part>
 
 
diff --git a/chromium/components/resources/version_ui_resources.grdp b/chromium/components/resources/version_ui_resources.grdp
index 74bf2ce4065..c76e74980ac 100644
--- a/chromium/components/resources/version_ui_resources.grdp
+++ b/chromium/components/resources/version_ui_resources.grdp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  <include name="IDR_VERSION_UI_CSS" file="../version_ui/resources/about_version.css" type="BINDATA" compress="gzip" />
-  <include name="IDR_VERSION_UI_HTML" file="../version_ui/resources/about_version.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" />
-  <include name="IDR_VERSION_UI_JS" file="../version_ui/resources/about_version.js" type="BINDATA" compress="gzip" />
+  <include name="IDR_VERSION_UI_CSS" file="../version_ui/resources/about_version.css" type="BINDATA" />
+  <include name="IDR_VERSION_UI_HTML" file="../version_ui/resources/about_version.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+  <include name="IDR_VERSION_UI_JS" file="../version_ui/resources/about_version.js" type="BINDATA" />
 </grit-part>
-- 
cgit v1.2.1