Skip to content

Commit

Permalink
Merge pull request #12016 from brave/98.0.4758.72_master
Browse files Browse the repository at this point in the history
Upgrade from Chromium 98.0.4758.66 to Chromium 98.0.4758.72.
  • Loading branch information
mkarolin committed Jan 27, 2022
1 parent 27b72df commit bfbac7b
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "98.0.4758.66",
"tag": "98.0.4758.72",
"repository": {
"url": "https://github.com/chromium/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index da62442f46d0ececf6bfdd76033bddc4924f3437..7caf7ce7c3b451bf13171827328e066b483ef333 100644
index cf9ba01d1d6b2e04d463251ba2c4ed2fd97e7f7b..2cae9183cf9f6d308399fc27fca0d5ec9c86c4b4 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=98
-MINOR=0
-BUILD=4758
-PATCH=66
-PATCH=72
+MINOR=1
+BUILD=36
+PATCH=76
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 99a426750fa6e61a696f978fdbbdaac1c8b02a35..80a6691c5980669232aa3f51d859e86e80f6e5d7 100644
index 2225d8871767ed71034b79bf7ae5c8b3d5412b32..f4f05d2c3cc585cc0cd520997181141edb3b28c1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -2396,6 +2396,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index a9b3713a72aec9c2bbc33a59311d65dd841e2896..d595a7a0deb8d449c67feb41696a1748770b8d1a 100644
index 3c6459bac55a69cdee21d0c21c4868aef2175b37..a739709a7a1dad52706ac43f581bb59b4f479161 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -837,6 +837,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
@@ -836,6 +836,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
TRACE_EVENT0("browser,startup",
"ExtensionManagementFactory::BuildServiceInstanceFor");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 7f6d34a69677f294bda42610a985e04413a2f557..3b212eb1508696e93eeba640a0773880aa85737f 100644
index 814d7a8a84501597c16efb879bf6859804910bda..6fc2eba310c50ce5b8fd377dc0eb167ba3ea9a81 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -661,6 +661,7 @@ void LocationBarView::Layout() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index 081167b636f5a6b4aee8cbed91c54c8788fa7555..b001e35de6a4a830899f9497ad4925c9c9899aa0 100644
index 82a1fc3d4e221629c4880044fdcf983a99387196..a3e4498a91ac9b975dd3a6af13591d4cef29c7ef 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -3200,16 +3200,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
@@ -3301,16 +3301,17 @@ base::WeakPtr<NavigationHandle> NavigationControllerImpl::NavigateWithoutEntry(
// Note: we intentionally leave the pending entry in place for renderer debug
// URLs, unlike the cases below where we clear it if the navigation doesn't
// proceed.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
index 733677a6e7b588837d2769914195a9c557722150..14bde0bf8fd3d8e8c0a754bfcfc542f0f55cb236 100644
index 26042a1efae8e7ede7276fbe012c96f7d81400b9..ab034871c809f1fd1a5f477e0a8bb4ac9e13e99e 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -2539,6 +2539,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -2540,6 +2540,7 @@ void NavigationRequest::OnRequestRedirected(
common_params_->url = redirect_info.new_url;
common_params_->method = redirect_info.new_method;
common_params_->referrer->url = GURL(redirect_info.new_referrer);
+ BRAVE_ONREQUESTREDIRECTED_MAYBEHIDEREFERRER
common_params_->referrer = Referrer::SanitizeForRequest(
common_params_->url, *common_params_->referrer);

@@ -3830,6 +3831,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -3831,6 +3832,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();

Expand Down
Original file line number Diff line number Diff line change
@@ -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 79019e612a09bee971cf62363ec186a8536744af..a0aba42f7d73fd6634ebb31083d3751ebc27c7c1 100644
index 7dcff091b5c0909757e77cdf4d76910449360df6..6a29b9384ba81f85bacb6d31e27ec3639e28b369 100644
--- a/third_party/blink/renderer/modules/mediastream/media_devices.cc
+++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc
@@ -596,6 +596,8 @@ void MediaDevices::DevicesEnumerated(
@@ -597,6 +597,8 @@ void MediaDevices::DevicesEnumerated(
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
index ca8c71828699beeb91ee5a9ba52d1c44ed23c702..22c41691391c72d727c95d7ab77f43bbf82ff496 100644
index 5d0af2e172a077998807225a4e99d9c247465e9c..49248ec28bc470701fd3a2a4cebd780de3f9eebe 100644
--- a/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
+++ b/tools/metrics/histograms/metadata/histogram_suffixes_list.xml
@@ -12401,6 +12401,7 @@ chromium-metrics-reviews@google.com.
@@ -12402,6 +12402,7 @@ chromium-metrics-reviews@google.com.
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>
Expand Down

0 comments on commit bfbac7b

Please sign in to comment.