Update/port to 113.0.5672.62

Author: vanadium-staging

args.gn

@@ -3,11 +3,11 @@ target_os = "android"
 target_cpu = "arm64"
 
 android_channel = "stable"
-android_default_version_name = "112.0.5615.136"
-android_default_version_code = "561513600"
+android_default_version_name = "113.0.5672.62"
+android_default_version_code = "567206200"
 
 ext_version_enabled = true
-ext_version_increment = "1"
+ext_version_increment = "0"
 
 is_component_build = false
 is_debug = false

patches/0001-disable-checkout_nacl.patch

@@ -1,4 +1,4 @@
-From 0814281db0bcc2d38e92ea96f7b2e274da85e946 Mon Sep 17 00:00:00 2001
+From d844f1df6a6745741de683a0a76feeea45bf4285 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <[email protected]>
 Date: Sat, 21 Nov 2020 01:30:06 -0500
 Subject: [PATCH] disable checkout_nacl
@@ -8,10 +8,10 @@ Subject: [PATCH] disable checkout_nacl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/DEPS b/DEPS
-index d6b071667e8b1..3ca384902fd95 100644
+index 5eb2318e8c7bb..5a2058032aaac 100644
 --- a/DEPS
 +++ b/DEPS
-@@ -110,7 +110,7 @@ vars = {
+@@ -107,7 +107,7 @@ vars = {
 
    # Check out and download nacl by default, unless on an arm mac.
    # This can be disabled e.g. with custom_vars.

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

@@ -1,4 +1,4 @@
-From e8b5c9e5543eb244f23507c7ae6f8d37b36063f4 Mon Sep 17 00:00:00 2001
+From 9c68d3df43bbcbd1058d4a518627b12853114c69 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <[email protected]>
 Date: Thu, 26 Jan 2017 01:30:12 -0500
 Subject: [PATCH] use 64-bit WebView processes
@@ -8,7 +8,7 @@ Subject: [PATCH] use 64-bit WebView processes
  1 file changed, 7 deletions(-)
 
 diff --git a/android_webview/nonembedded/java/AndroidManifest.xml b/android_webview/nonembedded/java/AndroidManifest.xml
-index 01e7a7c0f8f40..bc47aad9f73a3 100644
+index 83a908cf759ac..6601283130536 100644
 --- a/android_webview/nonembedded/java/AndroidManifest.xml
 +++ b/android_webview/nonembedded/java/AndroidManifest.xml
 @@ -42,13 +42,6 @@ by a child template that "extends" this file.

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

@@ -1,4 +1,4 @@
-From 4a16d064683d2b5fcaf0b563ddcd77a59b00e9d7 Mon Sep 17 00:00:00 2001
+From 595f9782716cfd3c4d4f07f9d552ec0f8b50d9bb Mon Sep 17 00:00:00 2001
 From: Daniel Micay <[email protected]>
 Date: Wed, 26 Dec 2018 10:20:24 -0500
 Subject: [PATCH] switch to -fstack-protector-strong
@@ -8,7 +8,7 @@ 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 9afb4425840b9..48d26e68a0a85 100644
+index d3adf9735ca95..070b553f51dd2 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -332,18 +332,12 @@ config("compiler") {

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

@@ -1,4 +1,4 @@
-From baa418de1a5bf306491e3bb9d2a9703194bacb49 Mon Sep 17 00:00:00 2001
+From f75bb37ce533343dc716e470ce35c5ddbbe81a7b Mon Sep 17 00:00:00 2001
 From: Daniel Micay <[email protected]>
 Date: Thu, 22 Dec 2016 07:15:34 -0500
 Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
@@ -8,7 +8,7 @@ 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 48d26e68a0a85..01f63464e45ab 100644
+index 070b553f51dd2..e7f08058a8626 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -348,6 +348,10 @@ config("compiler") {

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

@@ -1,4 +1,4 @@
-From d22c9358121da58554a6e6109cabe671c1df7caf Mon Sep 17 00:00:00 2001
+From b769e64a02df19739913039cbddcc3f79b1e7f48 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <[email protected]>
 Date: Wed, 8 Apr 2020 20:48:17 -0400
 Subject: [PATCH] enable -ftrivial-auto-var-init=zero
@@ -8,7 +8,7 @@ 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 01f63464e45ab..2cb978ad7e238 100644
+index e7f08058a8626..1f944ea8ebe6e 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -352,6 +352,10 @@ config("compiler") {

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

@@ -1,4 +1,4 @@
-From a806d5be0bff2f9e1a74a0543c199d45d4afa43d Mon Sep 17 00:00:00 2001
+From a1fdfee01a4b8e46b01ed117d4040904c3668ec9 Mon Sep 17 00:00:00 2001
 From: Daniel Micay <[email protected]>
 Date: Thu, 21 May 2020 14:07:54 -0400
 Subject: [PATCH] disable broken warning for auto var init
@@ -8,7 +8,7 @@ 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 2cb978ad7e238..fdd5e92c464cd 100644
+index 1f944ea8ebe6e..f3f7365c3a8cf 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
 @@ -353,7 +353,7 @@ config("compiler") {

patches/0007-Vanadium-branding.patch

@@ -1,4 +1,4 @@
-From d4fe9194872a7708b3fe23a064d22a1eb34bcdb8 Mon Sep 17 00:00:00 2001
+From 76f68c16155257e6c7c4c686de7d998b7bcf07a2 Mon Sep 17 00:00:00 2001
 From: fgei <[email protected]>
 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 75019fbc224e5..7a0b4452d2d5d 100644
+index fa35cf794a733..708c6d3e43d1d 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -89,24 +89,24 @@ if (current_toolchain == default_toolchain) {
+@@ -83,24 +83,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 75019fbc224e5..7a0b4452d2d5d 100644
      ]
    }
 
-@@ -114,16 +114,16 @@ if (current_toolchain == default_toolchain) {
+@@ -108,16 +108,16 @@ if (current_toolchain == default_toolchain) {
      sources = chrome_java_resources
      sources += [
        "//chrome/android/java/res_app/layout/main.xml",
@@ -140,7 +140,7 @@ index 75019fbc224e5..7a0b4452d2d5d 100644
      ]
 
      deps = [
-@@ -1939,16 +1939,16 @@ if (current_toolchain == default_toolchain) {
+@@ -1934,16 +1934,16 @@ if (current_toolchain == default_toolchain) {
    android_resources("chrome_public_apk_resources") {
      resource_overlay = true
      sources = [
@@ -167,7 +167,7 @@ index 75019fbc224e5..7a0b4452d2d5d 100644
      ]
 
      # Dep needed to ensure override works properly.
-@@ -1959,24 +1959,24 @@ if (current_toolchain == default_toolchain) {
+@@ -1954,24 +1954,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 10c4b3043ed5bf956a13238aef079df75f9d58a0 Mon Sep 17 00:00:00 2001
+From 95ec9f2669c86ad6da365414505616b40cc6b00c Mon Sep 17 00:00:00 2001
 From: Daniel Micay <[email protected]>
 Date: Sun, 16 Feb 2020 13:40:14 -0500
 Subject: [PATCH] Vanadium branding for WebView
@@ -8,7 +8,7 @@ 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 bc47aad9f73a3..8f591eedf174a 100644
+index 6601283130536..40682affb2c2e 100644
 --- a/android_webview/nonembedded/java/AndroidManifest.xml
 +++ b/android_webview/nonembedded/java/AndroidManifest.xml
 @@ -38,7 +38,7 @@ by a child template that "extends" this file.