chore: bump chromium to 134.0.6998.35 (35-x-y) (#45835)

* chore: bump chromium in DEPS to 134.0.6998.35

* Add UseCounter for potential PNA 2.0 breakage

Refs https://chromium-review.googlesource.com/c/chromium/src/+/6259197

(cherry picked from commit 1d9a4bf22ad1519e49be871b3927a2496ca0fd45)

* chore: update patches

* fix: duplicate crdtp symbols

(cherry picked from commit 161931bc5bb3eeeaf498277ce817c1cbece0d429)

* chore: fixup build_option_to_use_custom_inspector_protocol_path.patch

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <[email protected]>
Co-authored-by: John Kleinschmidt <[email protected]>

DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '134.0.6998.23',
+    '134.0.6998.35',
   'node_version':
     'v22.14.0',
   'nan_version':

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -33,10 +33,10 @@ index 1da9a118fedc612dfed638abba54e69b983d9185..f76f04f25307c9d49edf7462c16e0e04
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 9f293f4ddd146e183e50ad3a99f464c10d2aaab5..9de2b989244cdf2966004b40118ea1b13d3be7b0 100644
+index ab4deb1a228f512166251cce44aac7138e53c1f8..efa59376eddc72c94d0da83b0f785df88152f4c0 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4527,7 +4527,7 @@ static_library("browser") {
+@@ -4537,7 +4537,7 @@ static_library("browser") {
            [ "//chrome/browser/ui/webui/signin:profile_impl" ]
      }
  

patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch

@@ -112,7 +112,7 @@ index 5c4b8a05034f8defacbc13671fe9bc92f76ade5a..e7390e01f113755613f42d592b36108b
    string mime_type;
  
 diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
-index d8d746faec7d3251835b8c8d070940bdfb5c4b6a..d5b54e9e4d4969199c4ad7a08bd384009e221743 100644
+index 3597b9a0dc32d341d288afd97c492553bb41dec6..f81857ce6f58dbe9f5e8b20841b5ed99b66b7bef 100644
 --- a/services/network/url_loader.cc
 +++ b/services/network/url_loader.cc
 @@ -666,6 +666,9 @@ URLLoader::URLLoader(
@@ -134,7 +134,7 @@ index d8d746faec7d3251835b8c8d070940bdfb5c4b6a..d5b54e9e4d4969199c4ad7a08bd38400
      url_request_->SetResponseHeadersCallback(base::BindRepeating(
          &URLLoader::SetRawResponseHeaders, base::Unretained(this)));
    }
-@@ -2036,6 +2039,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
+@@ -2049,6 +2052,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) {
    }
  
    response_ = BuildResponseHead();

patches/chromium/fix_disabling_background_throttling_in_compositor.patch

@@ -12,7 +12,7 @@ invisible state of the `viz::DisplayScheduler` owned
 by the `ui::Compositor`.
 
 diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
-index 12cf38959be01d05cd43a9635ac87538c4f5e5ad..1a2a1bb5480085432c9575a90fb6959b9d0eac87 100644
+index e79025575281e14d53afc53ad12c1eb26775cf86..191750dc9b40fb3187b4d76392c9ac926e07462f 100644
 --- a/ui/compositor/compositor.cc
 +++ b/ui/compositor/compositor.cc
 @@ -350,7 +350,8 @@ void Compositor::SetLayerTreeFrameSink(

patches/chromium/mas_avoid_private_macos_api_usage.patch.patch

@@ -579,7 +579,7 @@ index a76028eed0249244d0559de102a756e3b2771b63..cb65efb56849d57e2e656f90d5b1d737
    return kAttributes;
  }
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index fec51f705d1a8424fdbff13d33aa6a2b16a650e5..42f5feab06cf2ebb20f851a78111aa952e8bff55 100644
+index fcb315726a70b150bf2238eef717dafcc8d8efd0..de8bfdd420e78b6dcf0415b360df207e4615d444 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -329,6 +329,7 @@ source_set("browser") {

patches/chromium/printing.patch

@@ -881,7 +881,7 @@ index 97cb6458bc9eec767db89b56abfc5f4b4136ff7b..d9a0b343158b8464b5c9aa8e0e655c0b
    ScriptingThrottler scripting_throttler_;
  
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 42f5feab06cf2ebb20f851a78111aa952e8bff55..5048a28983ad629fba2f300f57fd869056fcb510 100644
+index de8bfdd420e78b6dcf0415b360df207e4615d444..2d374ea7c1bbe77a931b16239e39d453b2d18575 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -3085,8 +3085,9 @@ source_set("browser") {

patches/node/.patches

@@ -43,3 +43,4 @@ build_remove_explicit_linker_call_to_libm_on_macos.patch
 linux_try_preadv64_pwritev64_before_preadv_pwritev_4683.patch
 build_change_crdtp_protocoltypetraits_signatures_to_avoid_conflict.patch
 test_make_eval_snapshot_tests_more_flexible.patch
+build_option_to_use_custom_inspector_protocol_path.patch

patches/node/build_option_to_use_custom_inspector_protocol_path.patch

@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <[email protected]>
+Date: Mon, 17 Feb 2025 20:57:05 +0900
+Subject: build: option to use custom inspector_protocol path
+
+This allows building against //third_party/inspector_protocol
+which would align us when building with chromium shared dependencies.
+
+The span changes will be auto-removed when Node.js bumps their
+protocol deps to contain https://chromium-review.googlesource.com/c/v8/v8/+/5996636
+
+Rest of the changes can be upstreamed.
+
+diff --git a/node.gni b/node.gni
+index 203b4abbc44df9e58083c819f61f9025104abdc6..73bf3839866a2652ca660f1117e8f249d33fa46a 100644
+--- a/node.gni
++++ b/node.gni
+@@ -16,6 +16,9 @@ declare_args() {
+   # The location of simdutf - use the one from node's deps by default.
+   node_simdutf_path = "//third_party/simdutf"
+ 
++  # The location of inspector_protocol - use the one from node's deps by default.
++  node_inspector_protocol_path = "//third_party/inspector_protocol"
++
+   # The NODE_MODULE_VERSION defined in node_version.h.
+   node_module_version = exec_script("$node_path/tools/getmoduleversion.py", [], "value")
+ 
+diff --git a/src/inspector/node_json.cc b/src/inspector/node_json.cc
+index d8aacbdf1a8fc858c792ad3ce17ca2f46baebe7e..4625008c048532c2c3340130670647d2877430bd 100644
+--- a/src/inspector/node_json.cc
++++ b/src/inspector/node_json.cc
+@@ -72,7 +72,7 @@ class ValueParserHandler : public ParserHandler {
+ 
+   void HandleBinary(span<uint8_t> bytes) override {
+     AddValueToParent(
+-        BinaryValue::create(Binary::fromSpan(bytes.data(), bytes.size())));
++        BinaryValue::create(Binary::fromSpan(bytes)));
+   }
+ 
+   void HandleDouble(double value) override {
+diff --git a/src/inspector/node_string.h b/src/inspector/node_string.h
+index 08e00f9b94918e3385aed18de80eec5c7ad81095..e84281c0e06f1d09889c5e1f2b2c5144f1b77564 100644
+--- a/src/inspector/node_string.h
++++ b/src/inspector/node_string.h
+@@ -63,7 +63,7 @@ class Binary {
+   static Binary fromBase64(const std::string_view base64, bool* success) {
+     UNREACHABLE();
+   }
+-  static Binary fromSpan(const uint8_t* data, size_t size) { UNREACHABLE(); }
++  static Binary fromSpan(crdtp::span<uint8_t> data) { UNREACHABLE(); }
+ };
+ 
+ }  // namespace protocol
+diff --git a/src/inspector/unofficial.gni b/src/inspector/unofficial.gni
+index 3d7aa148678b2646b88fa7c32abec91791b02b82..4810d93eb971b253f7dadff7011a632f6dbe6a2b 100644
+--- a/src/inspector/unofficial.gni
++++ b/src/inspector/unofficial.gni
+@@ -13,7 +13,7 @@ template("inspector_gn_build") {
+   }
+ 
+   node_gen_dir = get_label_info("../..", "target_gen_dir")
+-  protocol_tool_path = "../../deps/inspector_protocol"
++  protocol_tool_path = "$node_inspector_protocol_path"
+ 
+   gypi_values = exec_script(
+       "../../tools/gypi_to_gn.py",
+diff --git a/unofficial.gni b/unofficial.gni
+index cd0eae52ca9bf244e43643a2034fa9d26c4db206..d61a9bd5f4f0c92682f10b449976735859ecbc55 100644
+--- a/unofficial.gni
++++ b/unofficial.gni
+@@ -204,13 +204,14 @@ template("node_gn_build") {
+     }
+     if (node_enable_inspector) {
+       deps += [
+-        "src/inspector:crdtp",
++        "$node_inspector_protocol_path:crdtp",
+         "src/inspector:node_protocol_generated_sources",
+         "src/inspector:v8_inspector_compress_protocol_json",
+       ]
+       include_dirs = [
+         "$target_gen_dir/src",
+         "$target_gen_dir/src/inspector",
++        "$node_inspector_protocol_path",
+       ]
+       node_inspector = exec_script(
+           "./tools/gypi_to_gn.py",

shell/browser/net/url_loader_network_observer.h

@@ -70,6 +70,11 @@ class URLLoaderNetworkObserver
       const std::optional<std::string>& private_network_device_id,
       const std::optional<std::string>& private_network_device_name,
       OnPrivateNetworkAccessPermissionRequiredCallback callback) override {}
+  void OnUrlLoaderConnectedToPrivateNetwork(
+      const GURL& request_url,
+      network::mojom::IPAddressSpace response_address_space,
+      network::mojom::IPAddressSpace client_address_space,
+      network::mojom::IPAddressSpace target_address_space) override {}
   void Clone(
       mojo::PendingReceiver<network::mojom::URLLoaderNetworkServiceObserver>
           observer) override;

shell/common/api/electron_api_url_loader.h

@@ -129,6 +129,11 @@ class SimpleURLLoaderWrapper final
   void Clone(
       mojo::PendingReceiver<network::mojom::URLLoaderNetworkServiceObserver>
           observer) override;
+  void OnUrlLoaderConnectedToPrivateNetwork(
+      const GURL& request_url,
+      network::mojom::IPAddressSpace response_address_space,
+      network::mojom::IPAddressSpace client_address_space,
+      network::mojom::IPAddressSpace target_address_space) override {}
 
   scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactoryForURL(
       const GURL& url);