Update/port to 112.0.5615.48

Author: vanadium-staging

args.gn

@@ -3,8 +3,8 @@ target_os = "android"
 target_cpu = "arm64"
 
 android_channel = "stable"
-android_default_version_name = "111.0.5563.116"
-android_default_version_code = "556311600"
+android_default_version_name = "112.0.5615.48"
+android_default_version_code = "561504800"
 
 ext_version_enabled = true
 ext_version_increment = "0"

patches/0001-disable-checkout_nacl.patch

@@ -1,4 +1,4 @@
-From 0ec2a1db1a9711d3b5cc883ee36c863c8864dfdb Mon Sep 17 00:00:00 2001
+From f444d6ebc085173a52e5744bdff0c6ee41caf908 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Sat, 21 Nov 2020 01:30:06 -0500
 Subject: [PATCH] disable checkout_nacl
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index b670ee3ff1af5..c3d85c1ef45a4 100644
+index 14a69660bca08..0d84ac3aeec95 100644
 --- a/DEPS
 +++ b/DEPS
 @@ -110,7 +110,7 @@ vars = {

patches/0002-use-64-bit-WebView-processes.patch

@@ -1,21 +1,27 @@
-From a61ef5391ff74331311d56771b92e46fca19401b Mon Sep 17 00:00:00 2001
+From 7b31a2d52e286e43f869ed61d0a51e737ac3959b Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 26 Jan 2017 01:30:12 -0500
 Subject: [PATCH] use 64-bit WebView processes
 
 ---
- android_webview/nonembedded/java/AndroidManifest.xml | 1 -
- 1 file changed, 1 deletion(-)
+ android_webview/nonembedded/java/AndroidManifest.xml | 7 -------
+ 1 file changed, 7 deletions(-)
 
 diff --git a/android_webview/nonembedded/java/AndroidManifest.xml b/android_webview/nonembedded/java/AndroidManifest.xml
-index a6ec0a7d6391c..ce806a2233dde 100644
+index 01e7a7c0f8f40..bc47aad9f73a3 100644
 --- a/android_webview/nonembedded/java/AndroidManifest.xml
 +++ b/android_webview/nonembedded/java/AndroidManifest.xml
-@@ -37,7 +37,6 @@ by a child template that "extends" this file.
+@@ -42,13 +42,6 @@ by a child template that "extends" this file.
                   android:icon="@{{manifest_package|default('com.android.webview')}}:drawable/icon_webview"
                   android:name="{{ application_name|default('org.chromium.android_webview.nonembedded.WebViewApkApplication') }}"
                   android:multiArch="true"
+-                 {% if force_32_bit is defined and force_32_bit == 'true' %}
+-                 android:use32bitAbi="true"
+-                 {% endif %}
+-                 {# TODO(crbug.com/1411557): Remove #}
+-                 {% if force_32_bit is not defined %}
 -                 {{ use32bitAbi|default('android:use32bitAbi="true"') }}
+-                 {% endif %}
                   android:extractNativeLibs="false">
          {# This part is shared between stand-alone WebView and Monochrome #}
          {% macro common(manifest_package, webview_lib) %}

patches/0003-switch-to-fstack-protector-strong.patch

@@ -1,4 +1,4 @@
-From 82249b3df0e65dddbfdae9ddb4f451b66ed9871c Mon Sep 17 00:00:00 2001
+From 07d783eec199ccd4d4c43be248b36bae9a7fe24b Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 26 Dec 2018 10:20:24 -0500
 Subject: [PATCH] switch to -fstack-protector-strong
@@ -8,10 +8,10 @@ Subject: [PATCH] switch to -fstack-protector-strong
  1 file changed, 1 insertion(+), 7 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index ef3285ae74e1b..7e4e7a8a218d8 100644
+index 9afb4425840b9..48d26e68a0a85 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -327,18 +327,12 @@ config("compiler") {
+@@ -332,18 +332,12 @@ config("compiler") {
          cflags += [ "-fstack-protector" ]
        }
      } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {

patches/0004-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

@@ -1,4 +1,4 @@
-From 0fa40ad4fafe0bebf91f21e1075a8be9d93f6652 Mon Sep 17 00:00:00 2001
+From 3c4f6198fda1770529b843692a77b05eb97e660e Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 22 Dec 2016 07:15:34 -0500
 Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
@@ -8,10 +8,10 @@ Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 7e4e7a8a218d8..77a1b32b1b3c0 100644
+index 48d26e68a0a85..01f63464e45ab 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -343,6 +343,10 @@ config("compiler") {
+@@ -348,6 +348,10 @@ config("compiler") {
        }
      }
 

patches/0005-enable-ftrivial-auto-var-init-zero.patch

@@ -1,4 +1,4 @@
-From 34547ce9a8118b82db374fd2c01d747ca63c750e Mon Sep 17 00:00:00 2001
+From ccbc507eb9103432f81b6be91bcf6ab589fae549 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Wed, 8 Apr 2020 20:48:17 -0400
 Subject: [PATCH] enable -ftrivial-auto-var-init=zero
@@ -8,10 +8,10 @@ Subject: [PATCH] enable -ftrivial-auto-var-init=zero
  1 file changed, 4 insertions(+)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 77a1b32b1b3c0..ed566b00b952b 100644
+index 01f63464e45ab..2cb978ad7e238 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -347,6 +347,10 @@ config("compiler") {
+@@ -352,6 +352,10 @@ config("compiler") {
        cflags += [ "-fwrapv" ]
      }
 

patches/0006-disable-broken-warning-for-auto-var-init.patch

@@ -1,4 +1,4 @@
-From 817be1a126c98e0014d25126f7cafc001f769181 Mon Sep 17 00:00:00 2001
+From 5dc230ab11fe42ed45a2e8abfa9707c17af4e417 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Thu, 21 May 2020 14:07:54 -0400
 Subject: [PATCH] disable broken warning for auto var init
@@ -8,10 +8,10 @@ Subject: [PATCH] disable broken warning for auto var init
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index ed566b00b952b..e6477bec6425d 100644
+index 2cb978ad7e238..fdd5e92c464cd 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -348,7 +348,7 @@ config("compiler") {
+@@ -353,7 +353,7 @@ config("compiler") {
      }
 
      if (is_clang) {

patches/0007-Vanadium-branding.patch

@@ -1,4 +1,4 @@
-From 7d2389fb669afd96aeb9b715057ccdf279cee4d7 Mon Sep 17 00:00:00 2001
+From 0392d5413f98ae5d7a7b342c62bc8ab337cc3b3c Mon Sep 17 00:00:00 2001
 From: fgei <fgei@gmail.com>
 Date: Tue, 19 Oct 2021 02:21:18 +0000
 Subject: [PATCH] Vanadium branding
@@ -67,10 +67,10 @@ Current incantation of the recolor command:
  create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 73cde65137ccb..9e74ba01e1d3f 100644
+index 75019fbc224e5..7a0b4452d2d5d 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -205,24 +205,24 @@ if (current_toolchain == default_toolchain) {
+@@ -89,24 +89,24 @@ if (current_toolchain == default_toolchain) {
        "java/res_base/values/ic_launcher_round_alias.xml",
        "java/res_base/values/values.xml",
        "java/res_base/xml/network_security_config.xml",
@@ -113,7 +113,7 @@ index 73cde65137ccb..9e74ba01e1d3f 100644
      ]
    }
 
-@@ -230,16 +230,16 @@ if (current_toolchain == default_toolchain) {
+@@ -114,16 +114,16 @@ if (current_toolchain == default_toolchain) {
      sources = chrome_java_resources
      sources += [
        "//chrome/android/java/res_app/layout/main.xml",
@@ -140,7 +140,7 @@ index 73cde65137ccb..9e74ba01e1d3f 100644
      ]
 
      deps = [
-@@ -2034,16 +2034,16 @@ if (current_toolchain == default_toolchain) {
+@@ -1939,16 +1939,16 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_resources") {
      resource_overlay = true
      sources = [
@@ -167,7 +167,7 @@ index 73cde65137ccb..9e74ba01e1d3f 100644
      ]
 
      # Dep needed to ensure override works properly.
-@@ -2054,24 +2054,24 @@ if (current_toolchain == default_toolchain) {
+@@ -1959,24 +1959,24 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_base_module_resources") {
      resource_overlay = true
      sources = [

patches/0008-Vanadium-branding-for-WebView.patch

@@ -1,4 +1,4 @@
-From 942e67b9835fd5c9a002dba5e65a63c05ceb43fc Mon Sep 17 00:00:00 2001
+From 53885868dab6f9f8f2d0160774098f70eb30be7b Mon Sep 17 00:00:00 2001
 From: Daniel Micay <danielmicay@gmail.com>
 Date: Sun, 16 Feb 2020 13:40:14 -0500
 Subject: [PATCH] Vanadium branding for WebView
@@ -8,10 +8,10 @@ Subject: [PATCH] Vanadium branding for WebView
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/android_webview/nonembedded/java/AndroidManifest.xml b/android_webview/nonembedded/java/AndroidManifest.xml
-index ce806a2233dde..61b6fd3af670b 100644
+index bc47aad9f73a3..8f591eedf174a 100644
 --- a/android_webview/nonembedded/java/AndroidManifest.xml
 +++ b/android_webview/nonembedded/java/AndroidManifest.xml
-@@ -33,7 +33,7 @@ by a child template that "extends" this file.
+@@ -38,7 +38,7 @@ by a child template that "extends" this file.
      <!-- Required to run the foreground service-->
      <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />