From d0e8f9b306b7c1c9c1313d6f41f2cd3b5c8c2150 Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Mon, 21 Feb 2022 14:29:20 -0800 Subject: [PATCH] chore: bump chromium to 98.0.4758.102 (17-x-y) (#32906) Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> --- DEPS | 2 +- .../build_do_not_depend_on_packed_resource_integrity.patch | 2 +- .../feat_expose_raw_response_headers_from_urlloader.patch | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index efd8d1933e8d7..515ea0d70fb9b 100644 --- a/DEPS +++ b/DEPS @@ -15,7 +15,7 @@ gclient_gn_args = [ vars = { 'chromium_version': - '98.0.4758.82', + '98.0.4758.102', 'node_version': 'v16.13.0', 'nan_version': diff --git a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch index e7695344e84bc..0d32574198503 100644 --- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch +++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch @@ -46,7 +46,7 @@ index 0982cfa1db7233153af8b2ab7cd1c18dfb4dea49..b0f575de4c9dc6e23da5822a1591d784 } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index cf07780786f235b567b754f4f91a4d716bd86778..a575ed30de3991c1c5189a0aad9f63aee9f93374 100644 +index 19387561ba18f2f9bf3a6ef42fc32b9adc7ac375..9c6ae050454f6e0c5032f3aea43e4123e06f3ff3 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -5529,7 +5529,6 @@ test("unit_tests") { diff --git a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch index 19c52e956dd8c..ce6c01726e697 100644 --- a/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch +++ b/patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch @@ -103,7 +103,7 @@ index 76a0a192fda9578fd243063ebad5831762539cf6..47234af6519479ea77d503bacda1a84b string mime_type; diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc -index e53ff47c6f43d00fd89695c4ef08ef5f455df103..56dce34839df7569361bfe7076f6dd2f7ef307c7 100644 +index 4fa80ce0d531a115eb23a58236847c42218f9cb3..a7e5e699940181d6f345de354694239686fa57f6 100644 --- a/services/network/url_loader.cc +++ b/services/network/url_loader.cc @@ -532,6 +532,7 @@ URLLoader::URLLoader( @@ -123,7 +123,7 @@ index e53ff47c6f43d00fd89695c4ef08ef5f455df103..56dce34839df7569361bfe7076f6dd2f url_request_->SetResponseHeadersCallback(base::BindRepeating( &URLLoader::SetRawResponseHeaders, base::Unretained(this))); } -@@ -1340,6 +1341,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { +@@ -1358,6 +1359,19 @@ void URLLoader::OnResponseStarted(net::URLRequest* url_request, int net_error) { response_ = network::mojom::URLResponseHead::New(); PopulateResourceResponse(url_request_.get(), is_load_timing_enabled_, options_, response_.get());