Merge pull request #3760 from brave/78.0.3904.70

Upgrade patches from Chromium 78.0.3904.50 to Chromium 78.0.3904.70

app/settings_brave_strings.grdp

@@ -24,13 +24,12 @@
     </message>
   </if>
   <if expr="chromeos">
-    <message name="IDS_SETTINGS_ABOUT_OS_BANNER" desc="Banner displayed in the browser About page that links to the OS About page.">
-      For Brave OS details, please see <ph name="LINK_BEGIN">&lt;a href="chrome://os-settings/help"&gt;</ph>
-      About Brave OS<ph name="LINK_END">&lt;/a&gt;</ph>
-    </message>
     <message name="IDS_SETTINGS_ABOUT_OS" desc="Menu title for the About Brave OS page.">
       About Brave OS
     </message>
+    <message name="IDS_SETTINGS_ABOUT_SEE_OS_SETTINGS_FOR_UPDATE_MESSAGE" desc="Message shown to users on Brave browser settings which alerts the user that OS updates are shown in Brave OS settings.">
+      To see if your device is up to date, go to <ph name="LINK_BEGIN">&lt;a href="chrome://os-settings/help"&gt;</ph>Brave OS Settings<ph name="LINK_END">&lt;/a&gt;</ph>
+    </message>
     <message name="IDS_SETTINGS_GET_HELP_USING_CHROME_OS" desc="Text of the button which takes the user to the Brave help page.">
       Get help with Brave OS
     </message>

app/settings_strings.grdp

@@ -193,11 +193,14 @@
   <message name="IDS_SETTINGS_CAPTIONS_BACKGROUND_OPACITY" desc="Name of the caption background opacity preference.">
     Background opacity
   </message>
-  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_MIN" desc="Value of the minimum captions text opacity setting.">
-    0
+  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_OPAQUE" desc="Name of the opaque opacity preference.">
+    Opaque
   </message>
-  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_MAX" desc="Value of the maximum captions text opacity setting.">
-    100
+  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_SEMI_TRANSPARENT" desc="Name of the semi-transparent opacity preference.">
+    Semi-transparent
+  </message>
+  <message name="IDS_SETTINGS_CAPTIONS_OPACITY_TRANSPARENT" desc="Name of the transparent opacity preference.">
+    Transparent
   </message>
   <message name="IDS_SETTINGS_CAPTIONS_TEXT_SHADOW" desc="Name of the caption text shadow preference.">
     Text shadow

patches/chrome-VERSION.patch

@@ -1,11 +1,11 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 02f4b3b1076568fa921ea5dd11ea564c7fb06796..c3900198d264ceda61027aa618e0c46ef8847acc 100644
+index 149b97a0bd4e2d85b0efc97203e9c5d99fbb62a9..b6e43a5d727c092caab8f3155a8c17f4469c39b9 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=78
  MINOR=0
 -BUILD=3904
--PATCH=50
+-PATCH=70
 +BUILD=72
 +PATCH=107

patches/chrome-android-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a27ba353d 100644
+index cb76914c7ca0268b2e39c0b50cfa5eccb65bf907..fc18e20a6c467c62efda34d1ff2b982f71179cec 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -32,7 +32,7 @@ import("java_sources.gni")
@@ -19,15 +19,15 @@ index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a
      "//chrome/android/webapk/libs/common:splash_resources",
      "//chrome/app:java_strings_grd",
      "//chrome/browser/ui/android/widget:ui_widget_java_resources",
-@@ -543,6 +544,7 @@ java_group("chrome_all_java") {
+@@ -544,6 +545,7 @@ java_group("chrome_all_java") {
  group("jni_headers") {
    public_deps = [
      ":chrome_jni_headers",
 +    "//brave/build/android:jni_headers",
      "//chrome/android/features/autofill_assistant:jni_headers",
      "//chrome/android/features/keyboard_accessory:jni_headers",
      "//chrome/android/features/media_router:jni_headers",
-@@ -1422,6 +1424,7 @@ if (current_toolchain == default_toolchain) {
+@@ -1423,6 +1425,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]

patches/chrome-android-java-res-values-dimens.xml.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
-index 2fa76012e096cbf44c27e86da30ff641c5865710..4b8f88e4a51dd17b9317286f8bcbdf465fa8c952 100644
+index 6ce0551695a4c3a823ffc4d1482a3bdbd1e0c66f..32ad9ede9c6276afd67b3517135b83261aca2648 100644
 --- a/chrome/android/java/res/values/dimens.xml
 +++ b/chrome/android/java/res/values/dimens.xml
-@@ -309,7 +309,7 @@
+@@ -308,7 +308,7 @@
      <dimen name="modern_toolbar_background_size">40dp</dimen>
      <!-- Sometimes the modern toolbar is shown at 48dp so a corner radius of
           24dp is needed to completely round the corners. -->

patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index 9de151eff10dd902d494e9d44419cf9138e365e9..9c10c231c53f707a146b0c0a381b739aa2421dd6 100644
+index 0275c213018b897fcde045286f9b9416c070a6a8..f9021a9dc0f5b966834d93b6382c94fb53fdf958 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 @@ -179,7 +179,7 @@ import java.util.Locale;

patches/chrome-browser-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 38c89002e6bbc2bd07e7260624b148e9e1225c10..c310f381c05285399d672c110a0662b9370aae31 100644
+index d730660c086f9a47d524708b2b477501e257bfaa..8f7b2e5019dde9ad232e128aca9b45f0475c5203 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2226,6 +2226,7 @@ jumbo_split_static_library("browser") {

patches/chrome-browser-about_flags.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 3ceed0556297ef443366b303efd7f752c76a98ea..a59d7b4d0522a2ba1e9d66356d57cb0f2d5e9465 100644
+index e608f06a232ab1acb64916806755caac1dcec607..d422a54c8696c3afdef13e223bf25c2697f0f2c9 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -280,14 +280,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {

patches/chrome-browser-android-chrome_feature_list.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
-index 5a292bf4825f48e20513bcf6b313e080b0db5a9a..4e696dd969003256dae6ad2aa51e34b3f5f3d7f4 100644
+index bfeea2227a320b1580868a64875d7497b8455fdb..cee091d8c6f409febd66a3f4ec42fa3cebf2b24e 100644
 --- a/chrome/browser/android/chrome_feature_list.cc
 +++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -220,6 +220,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
+@@ -231,6 +231,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
  };
 
  const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) {

patches/chrome-browser-resources-settings-about_page-about_page.html.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html
-index 4571c6eea39c5c279c89f1621a6596e9676501e5..69bc8263a7626c62f4c8840e1bb40b544b3979ff 100644
+index 99c0a1c19a17bcb93b4e180e629f0f786477a4f2..3a043b55610c14cb4eddd6282b3e83085b243814 100644
 --- a/chrome/browser/resources/settings/about_page/about_page.html
 +++ b/chrome/browser/resources/settings/about_page/about_page.html
-@@ -160,7 +160,7 @@
+@@ -137,7 +137,7 @@
                  </div>
                  <a hidden$="[[!shouldShowLearnMoreLink_(
                      currentUpdateStatusEvent_)]]" target="_blank"

patches/chrome-browser-resources-settings-about_page-about_page.js.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js
-index 6dff486f7ca396bb52b80b73205908421e233a29..ce007ca3b731900367c395c55d314b98d6f99e96 100644
+index d4781a4d1b77d85f9a204bb1bb12d97ca7a31756..9cb9b41a4503f34ded883c0184a1f30e0145c8c0 100644
 --- a/chrome/browser/resources/settings/about_page/about_page.js
 +++ b/chrome/browser/resources/settings/about_page/about_page.js
-@@ -355,7 +355,14 @@ Polymer({
+@@ -347,7 +347,14 @@ Polymer({
 
    /** @private */
    onRelaunchTap_: function() {

patches/chrome-browser-ui-content_settings-content_setting_bubble_model.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
-index e97bcf25f13b25b2238f2f897892a59cea12cbf2..df1d72388124dd9d508cd9bd6dcfaec23c718da4 100644
+index a0c3caad0b3af776341dcffea12ca2ea735a6886..7d408e9edfce2f0cfe6c91fcfe1782980483d3f8 100644
 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
 +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
 @@ -15,6 +15,7 @@
@@ -10,7 +10,7 @@ index e97bcf25f13b25b2238f2f897892a59cea12cbf2..df1d72388124dd9d508cd9bd6dcfaec2
  #include "chrome/browser/browser_process.h"
  #include "chrome/browser/content_settings/chrome_content_settings_utils.h"
  #include "chrome/browser/content_settings/cookie_settings_factory.h"
-@@ -1676,7 +1677,7 @@ ContentSettingBubbleModel::CreateContentSettingBubbleModel(
+@@ -1693,7 +1694,7 @@ ContentSettingBubbleModel::CreateContentSettingBubbleModel(
          delegate, web_contents, content_type);
    }
    if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS) {

patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
-index 7266999e9121d0c8b52bf9ebad6bfb30f747eeed..57bd53768fedf8c86cbdda690778e8939953c968 100644
+index efbc68a2296666753fd5bf1ccf0cae8d52731b7d..91a63a7f529bd8e68787bb46605bab8abcdf61fd 100644
 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
 +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
-@@ -133,7 +133,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
+@@ -144,7 +144,7 @@ views::Widget* TranslateBubbleView::ShowBubble(
            source_language, target_language));
    std::unique_ptr<TranslateBubbleModel> model(
        new TranslateBubbleModelImpl(step, std::move(ui_delegate)));

patches/chrome-browser-ui-views-translate-translate_bubble_view.h.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h
-index 92a60e4884bb34c3f1fd1ab7c7b50d85fcb3cd82..6fc0d4b14d48e540062c2ff388a08fd9766264b5 100644
+index 2adf74e9eab0a431126c77b611b3d3938a6caaae..0c329a6336d811fb2aa4ef645339972fa16b8663 100644
 --- a/chrome/browser/ui/views/translate/translate_bubble_view.h
 +++ b/chrome/browser/ui/views/translate/translate_bubble_view.h
-@@ -123,6 +123,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
+@@ -125,6 +125,7 @@ class TranslateBubbleView : public LocationBarBubbleDelegateView,
 
    // Returns the current view state.
    TranslateBubbleModel::ViewState GetViewState() const;

patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-index 0c4646f48cd15e11a430ad7e6c465aa1cd973f50..5e6d258d8751ac68dac92d8eaaafe605ff7c1bac 100644
+index 3ff5f45c78b4a7ca9fa8bc1f59f787fbe01b3792..09b896bef4082bc3ec1b67565944ebfc9e5c9e5f 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 @@ -3407,6 +3407,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,

patches/chrome-renderer-chrome_content_renderer_client.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index 03781c0b08e0157fd478f286b2a80c83d6495a53..e5c361bea59094a4fc71217de4367031a6757f6d 100644
+index 6ad2480f3e26c5f64f32f332e391b5575785e10b..4f7332cde8610cd62a0eb3def458e7b7e746957a 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
 @@ -22,6 +22,7 @@
@@ -10,7 +10,7 @@ index 03781c0b08e0157fd478f286b2a80c83d6495a53..e5c361bea59094a4fc71217de4367031
  #include "chrome/common/buildflags.h"
  #include "chrome/common/channel_info.h"
  #include "chrome/common/chrome_content_client.h"
-@@ -462,7 +463,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
+@@ -463,7 +464,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
    bool should_whitelist_for_content_settings =
        base::CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kInstantProcess);

patches/chrome-test-BUILD.gn.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index a08aa22bb990b32aa73d3c0f6783575d539f7423..35287d9997379ffba7afabfe04a8707c0e2a06cb 100644
+index 86ad48852953f05cec32c7a2a6286ffb378b5af2..d40fb830723a6e89990afda51717af12629e3a45 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -721,6 +721,7 @@ if (!is_android) {
+@@ -722,6 +722,7 @@ if (!is_android) {
        "//v8",
      ]
 

patches/content-browser-frame_host-navigation_request.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
-index 67ce9117a121ceb3127db83319a158dcfaad86cb..cf2a32cc2fe7ef3bd8d41b0e4d672e905586e3aa 100644
+index 35381afde314edfad67ad6da4fe7e32111402adf..018eb435968e9e2b812890aa89693b4b449d275a 100644
 --- a/content/browser/frame_host/navigation_request.cc
 +++ b/content/browser/frame_host/navigation_request.cc
-@@ -1987,6 +1987,7 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -2015,6 +2015,7 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
 

patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
-index 084a39ff19cea681407edae35372701419d42406..274fec63d4936a1ce595d032e923c499f2ccd161 100644
+index b57e5c02dfb2e88db01c87df47c67a848f221776..a3701709c9eb9da496425dbb3f32a5de1f0c78ff 100644
 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
 +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc
 @@ -37,6 +37,7 @@
@@ -10,7 +10,7 @@ index 084a39ff19cea681407edae35372701419d42406..274fec63d4936a1ce595d032e923c499
  #include "build/build_config.h"
  #include "third_party/blink/public/common/features.h"
  #include "third_party/blink/public/platform/task_type.h"
-@@ -905,6 +906,8 @@ String HTMLCanvasElement::ToDataURLInternal(
+@@ -907,6 +908,8 @@ String HTMLCanvasElement::ToDataURLInternal(
  String HTMLCanvasElement::toDataURL(const String& mime_type,
                                      const ScriptValue& quality_argument,
                                      ExceptionState& exception_state) const {
@@ -19,7 +19,7 @@ index 084a39ff19cea681407edae35372701419d42406..274fec63d4936a1ce595d032e923c499
    if (!OriginClean()) {
      exception_state.ThrowSecurityError("Tainted canvases may not be exported.");
      return String();
-@@ -923,6 +926,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
+@@ -925,6 +928,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
                                 const String& mime_type,
                                 const ScriptValue& quality_argument,
                                 ExceptionState& exception_state) {

patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
-index 9d49f83c36c8bda261ecd5e2a869842d7734cf06..3612236bbe7e7596e59edbf8c8e38c2d47caf3f4 100644
+index b54d60ee2d0d31bb3ea74c5fc9eb7fe5c068687b..99885edce06043e3fbb7a4963f833eb5832a3ac3 100644
 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
 @@ -10,6 +10,7 @@

patches/tools-metrics-histograms-histograms.xml.patch

@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
-index 77cb1dd65846c7237d422d7bf30dea63b450085f..8dcd4a6a6086afc9b0eba86096600acd848627dc 100644
+index ec43c2137b2ef787b2437c174eb6bd6a3ccec3da..1cda23a2a6f2afe4ee44ad60c7cfa1888854079a 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -171458,6 +171458,7 @@ regressions. -->
+@@ -171497,6 +171497,7 @@ regressions. -->
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>