Upgrade from Chromium 120.0.6099.71 to Chromium 120.0.6099.115 (1.62.…

…x). (#21356)

* Upgrade from Chromium 120.0.6099.71 to Chromium 120.0.6099.115

* Update pins list timestamp

---------

Co-authored-by: brave-builds <brave-builds+devops@brave.com>

chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc

@@ -549,9 +549,9 @@ bool ParseCertificatesFile(std::string_view certs_input,
                            Pinsets* pinsets,
                            base::Time* timestamp) {
   constexpr std::string_view brave_certs = R"brave_certs(
-# Last updated: Wed Dec  6 22:24:04 UTC 2023
+# Last updated: Wed Dec 13 01:12:45 UTC 2023
 PinsListTimestamp
-1701901444
+1702429965
 
 # =====BEGIN BRAVE ROOTS ASC=====
 #From https://www.amazontrust.com/repository/

package.json

@@ -268,7 +268,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "120.0.6099.71",
+        "tag": "120.0.6099.115",
         "repository": {
           "url": "https://github.com/brave/chromium"
         }

patches/chrome-android-chrome_public_apk_tmpl.gni.patch

@@ -1,32 +1,32 @@
 diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
-index 13ab7ec536d429e3444ab640c790b51af183be33..90da902b31d995ab8626b03b99426763f2f331bd 100644
+index 43a9301530e6ee92c79ea5b375f2fcecfadcb34b..6d7db2a1f8fef7b4c8f292adc29d0cd886dadd05 100644
 --- a/chrome/android/chrome_public_apk_tmpl.gni
 +++ b/chrome/android/chrome_public_apk_tmpl.gni
-@@ -309,6 +309,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -313,6 +313,7 @@ template("chrome_common_apk_or_module_tmpl") {
        "*ic_file_download_white*",  # Bottom edge seems misaligned.
        "*ic_lock.*",  # Bottom edge seems misaligned.
      ]
 +    resource_exclusion_exceptions += brave_resources_exclusion_exceptions
 
      # Most of these, with the exception of resource_exclusion_exceptions,
      # are currently duplicated in system_webview_apk_tmpl.gni.
-@@ -333,6 +334,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -337,6 +338,7 @@ template("chrome_common_apk_or_module_tmpl") {
 
        proguard_enabled = true
        proguard_configs = [ "//chrome/android/proguard/main.flags" ]
 +      proguard_configs += [ "//brave/android/java/proguard.flags" ]
        if (_is_monochrome) {
          proguard_configs +=
              [ "//android_webview/nonembedded/java/proguard.flags" ]
-@@ -744,6 +746,7 @@ template("chrome_common_apk_or_module_tmpl") {
+@@ -748,6 +750,7 @@ template("chrome_common_apk_or_module_tmpl") {
                                   "version_code",
                                   "version_name",
                                 ])
 +    _wireguard_target = "//brave/third_party/android_deps:com_wireguard_android_J__unpack_aar" deps += [ _wireguard_target] _libwireguard_dir = get_label_info("//brave/third_party/android_deps:com_wireguard_android($default_toolchain)","target_out_dir") + "/com_wireguard_android_java/jni" loadable_modules +=[ "$_libwireguard_dir/$android_app_abi/libwg-go.so" ]
    }
  }
 
-@@ -772,6 +775,7 @@ template("monochrome_public_common_apk_or_module_tmpl") {
+@@ -776,6 +779,7 @@ template("monochrome_public_common_apk_or_module_tmpl") {
      if (!defined(is_monochrome)) {
        is_trichrome = true
      }

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

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
-index 98b41c995c29cc1eed921f23d1c40871562208cc..e648b4863b90deb3000bbd191540f90843279f39 100644
+index 8735124455f0cca862d538b7dfb58fa0bfdc23bd..5e9817e9fd62abec5f0ead86d8d5753252faaef6 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
 @@ -36,6 +36,7 @@

patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
-index 7308ca6e09f2a34a32db27c318f27f868073a3a3..e1087ffb5e43a0503b32272613abfa5383f45e2c 100644
+index a1e6dcd5a2b8754b0896e743c1a7b67007fe08c9..737c87b8381bbb7cf826a87a2e153501eb730d47 100644
 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts
 @@ -21,6 +21,7 @@ import '../settings_page/settings_animated_pages.js';

patches/chrome-test-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index d1fc184a7d8cffec6b247cab7933d54d38ac59dc..5caf14300cbf0ac24059ee40c121ec6e31ba8987 100644
+index 513f89056096f8567ef68e90934f8a4f1f9081e2..59c64b7eab3c04dd3c2e48cb032df5d501010514 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -477,6 +477,7 @@ static_library("test_support") {

patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc
-index ffbe9983f22c1637d024659a03635b016dab97fd..ead48c6a275e166e5e212963d1f8ee2cd741055b 100644
+index 034e01f68a0972830903d490d5a32c1f9493f748..ee88e9519dd05b020f4ab2a6c44bebfc3d2ca9f2 100644
 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
 +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
-@@ -1042,6 +1042,7 @@ void MediaDevices::DevicesEnumerated(
+@@ -1053,6 +1053,7 @@ void MediaDevices::DevicesEnumerated(
      }
    }