Skip to content

Commit

Permalink
Merge pull request #16494 from brave/109.0.5414.61_1.47.x
Browse files Browse the repository at this point in the history
Upgrade from Chromium 109.0.5414.46 to Chromium 109.0.5414.61 (1.47.x)
  • Loading branch information
kjozwiak authored Dec 30, 2022
2 parents 3dccf61 + 7a0df7c commit 76dae7f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
base::StringPiece brave_certs = R"brave_certs(
# Last updated: Tue Dec 13 23:58:05 UTC 2022
# Last updated: Fri Dec 30 13:56:40 UTC 2022
PinsListTimestamp
1670975885
1672408600
# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "109.0.5414.46",
"tag": "109.0.5414.61",
"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 440a8b995b59b3c932b3ac3b29eafafb6d38b32d..94455060d3a62142d6856254b50b13d9e61325f9 100644
index 070704272ae3d829db2168943fcf5b39ef271ace..dc02e4b73884398d6989262f68b9eafb58df65c9 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=109
-MINOR=0
-BUILD=5414
-PATCH=46
-PATCH=61
+MINOR=1
+BUILD=47
+PATCH=156
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/resources/settings/settings_routes.ts b/chrome/browser/resources/settings/settings_routes.ts
index 2bace34bfad3d4b592a15514f6a0075bd611ac72..72ed64ed0385be5c7141516e3cbbcc4ab76b9882 100644
index 2bace34bfad3d4b592a15514f6a0075bd611ac72..9db96e5a2e7ec7f8014b4652d190e3d074cded73 100644
--- a/chrome/browser/resources/settings/settings_routes.ts
+++ b/chrome/browser/resources/settings/settings_routes.ts
@@ -89,4 +89,5 @@ export interface SettingsRoutes {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index 3d4d53f3a2a77359c6068157a45abb38de7da4b0..37a5108140d97a2074203b63b5c7e3df06f87379 100644
index b8d4c7b5e588d43296acdcfcbd919c376d1976cc..8b413a805302380eb3b0863d0876324f040bfa9c 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -347,6 +347,7 @@ AutocompleteController::AutocompleteController(
Expand All @@ -10,7 +10,7 @@ index 3d4d53f3a2a77359c6068157a45abb38de7da4b0..37a5108140d97a2074203b63b5c7e3df
}
// Providers run in the order they're added. Add `HistoryURLProvider` after
// `SearchProvider` because:
@@ -977,6 +978,7 @@ void AutocompleteController::UpdateResult(
@@ -993,6 +994,7 @@ void AutocompleteController::UpdateResult(
#if DCHECK_IS_ON()
result_.Validate();
#endif // DCHECK_IS_ON()
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 ad6106b649198011c3c2a41852a336e877707a17..72ec87c13a7c2922439ce3d7d4aca00c42f78ca4 100644
index 636b3e88c5b409e27af025993796e3f94b625c52..91b3f6bc7ee0f65e381e538b9dd6b8c80a0c61c6 100644
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -2928,6 +2928,7 @@ void NavigationRequest::OnRequestRedirected(
@@ -2930,6 +2930,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);

@@ -4414,6 +4415,7 @@ void NavigationRequest::OnStartChecksComplete(
@@ -4416,6 +4417,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();

Expand Down

0 comments on commit 76dae7f

Please sign in to comment.