Skip to content

Commit 76f98dc

Browse files
committed
Update to Chromium 137.0.7151.55
1 parent 1a4952e commit 76f98dc

File tree

68 files changed

+1333
-1045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1333
-1045
lines changed

chromium_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
136.0.7103.113
1+
137.0.7151.55

domain_substitution.list

Lines changed: 143 additions & 54 deletions
Large diffs are not rendered by default.

patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
--- a/chrome/browser/BUILD.gn
22
+++ b/chrome/browser/BUILD.gn
3-
@@ -3685,8 +3685,6 @@ static_library("browser") {
3+
@@ -3694,8 +3694,6 @@ static_library("browser") {
4+
"download/download_auto_open_policy_handler.cc",
5+
"download/download_auto_open_policy_handler.h",
46
"download/download_commands.cc",
5-
"download/download_crx_util.cc",
6-
"download/download_crx_util.h",
77
- "download/download_danger_prompt.cc",
88
- "download/download_danger_prompt.h",
99
"download/download_dir_policy_handler.cc",
1010
"download/download_dir_policy_handler.h",
1111
"download/download_dir_util.cc",
1212
--- a/chrome/browser/chrome_content_browser_client.cc
1313
+++ b/chrome/browser/chrome_content_browser_client.cc
14-
@@ -5467,10 +5467,6 @@ ChromeContentBrowserClient::CreateThrott
14+
@@ -5511,10 +5511,6 @@ ChromeContentBrowserClient::CreateThrott
1515
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
1616
handle, handle->GetWebContents()->GetBrowserContext()));
1717

@@ -180,7 +180,7 @@
180180
class DownloadsShowFunction : public ExtensionFunction {
181181
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
182182
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
183-
@@ -711,18 +711,6 @@ void WebstorePrivateBeginInstallWithMani
183+
@@ -705,18 +705,6 @@ void WebstorePrivateBeginInstallWithMani
184184

185185
void WebstorePrivateBeginInstallWithManifest3Function::
186186
ReportFrictionAcceptedEvent() {
@@ -226,7 +226,7 @@
226226
std::unique_ptr<std::string> response_body) {
227227
--- a/chrome/browser/extensions/blocklist_state_fetcher.h
228228
+++ b/chrome/browser/extensions/blocklist_state_fetcher.h
229-
@@ -36,8 +36,6 @@ class BlocklistStateFetcher {
229+
@@ -39,8 +39,6 @@ class BlocklistStateFetcher {
230230

231231
virtual void Request(const std::string& id, RequestCallback callback);
232232

@@ -253,22 +253,22 @@
253253

254254
# Note: is_android is not equivalent to safe_browsing_mode == 2.
255255
# Sources and dependencies added to this block must not depend on anything
256-
@@ -564,6 +566,7 @@ static_library("advanced_protection") {
256+
@@ -577,6 +579,7 @@ static_library("advanced_protection") {
257257
}
258258

259259
source_set("metrics_collector") {
260260
+ if (false) {
261261
sources = [
262262
"safe_browsing_metrics_collector_factory.cc",
263263
"safe_browsing_metrics_collector_factory.h",
264-
@@ -583,6 +586,7 @@ source_set("metrics_collector") {
264+
@@ -596,6 +599,7 @@ source_set("metrics_collector") {
265265
"//components/safe_browsing/core/common:safe_browsing_prefs",
266266
"//content/public/browser",
267267
]
268268
+ }
269269
}
270270

271-
source_set("test_support") {
271+
source_set("unit_tests") {
272272
--- a/chrome/browser/ui/views/download/BUILD.gn
273273
+++ b/chrome/browser/ui/views/download/BUILD.gn
274274
@@ -27,7 +27,6 @@ source_set("download") {

patches/core/inox-patchset/0003-disable-autofill-download-manager.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
22
+++ b/components/autofill/core/browser/crowdsourcing/autofill_crowdsourcing_manager.cc
3-
@@ -890,93 +890,6 @@ std::tuple<GURL, std::string> AutofillCr
3+
@@ -891,93 +891,6 @@ std::tuple<GURL, std::string> AutofillCr
44
}
55

66
bool AutofillCrowdsourcingManager::StartRequest(FormRequestData request_data) {

patches/core/inox-patchset/0005-disable-default-extensions.patch

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
extension_misc::kAssessmentAssistantExtensionId,
1111
--- a/chrome/browser/extensions/component_loader.cc
1212
+++ b/chrome/browser/extensions/component_loader.cc
13-
@@ -407,11 +407,6 @@ void ComponentLoader::AddWebStoreApp() {
13+
@@ -418,11 +418,6 @@ void ComponentLoader::AddWebStoreApp() {
1414
return;
1515
}
1616
#endif
@@ -36,7 +36,7 @@
3636
{
3737
--- a/chrome/browser/extensions/webstore_installer.cc
3838
+++ b/chrome/browser/extensions/webstore_installer.cc
39-
@@ -488,20 +488,6 @@ void WebstoreInstaller::DownloadNextPend
39+
@@ -485,20 +485,6 @@ void WebstoreInstaller::DownloadNextPend
4040

4141
void WebstoreInstaller::DownloadCrx(const extensions::ExtensionId& extension_id,
4242
InstallSource source) {
@@ -57,15 +57,11 @@
5757
}
5858

5959
// http://crbug.com/165634
60-
@@ -656,25 +642,6 @@ void WebstoreInstaller::UpdateDownloadPr
60+
@@ -653,21 +639,6 @@ void WebstoreInstaller::UpdateDownloadPr
6161
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
6262
DCHECK_CURRENTLY_ON(BrowserThread::UI);
6363
DCHECK(!crx_installer_.get());
6464
-
65-
- ExtensionService* service = ExtensionSystem::Get(profile_)->
66-
- extension_service();
67-
- CHECK(service);
68-
-
6965
- const InstallApproval* approval = GetAssociatedApproval(download);
7066
- DCHECK(approval);
7167
-

patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ by default.
178178
base::ToLowerASCII(bdict_file));
179179
--- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
180180
+++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
181-
@@ -33,7 +33,7 @@
181+
@@ -32,7 +32,7 @@
182182
namespace {
183183

184184
// The URL to be used to re-install Chrome when auto-update failed for too long.
@@ -405,14 +405,17 @@ by default.
405405
GURL url(base::WideToUTF16(args[0]));
406406
--- a/extensions/common/extension_urls.cc
407407
+++ b/extensions/common/extension_urls.cc
408-
@@ -38,11 +38,11 @@ const GURL* g_item_snippet_url_for_test_
408+
@@ -38,13 +38,13 @@ const GURL* g_item_snippet_url_for_test_
409409

410410
} // namespace
411411

412412
-const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
413413
-const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/";
414414
+const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore";
415415
+const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/";
416+
const char kExtensionsDocsWhatsNewURL[] =
417+
- "https://developer.chrome.com/docs/extensions/whats-new";
418+
+ "trk:06:https://developer.chrome.com/docs/extensions/whats-new";
416419
const char kChromeWebstoreUpdateURL[] =
417420
- "https://clients2.google.com/service/update2/crx";
418421
-const char kChromeWebstoreApiURL[] = "https://chromewebstore.googleapis.com/";

patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
1313

1414
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
1515
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
16-
@@ -324,6 +324,10 @@ void ClientSideDetectionService::StartCl
16+
@@ -342,6 +342,10 @@ void ClientSideDetectionService::StartCl
1717
return;
1818
}
1919

@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
2424
std::string request_data;
2525
request->SerializeToString(&request_data);
2626

27-
@@ -406,6 +410,7 @@ void ClientSideDetectionService::StartCl
27+
@@ -424,6 +428,7 @@ void ClientSideDetectionService::StartCl
2828
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
2929
base::Unretained(WebUIInfoSingleton::GetInstance()),
3030
std::move(request), access_token));

patches/core/ungoogled-chromium/block-requests.patch

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@
2626
std::string command_id;
2727
// Replace the promo URL with "command:<id>" if such a command ID is set
2828
// via the feature params.
29-
--- a/chrome/browser/search/background/ntp_background_service.cc
30-
+++ b/chrome/browser/search/background/ntp_background_service.cc
31-
@@ -96,6 +96,7 @@ void NtpBackgroundService::Shutdown() {
32-
}
33-
34-
void NtpBackgroundService::FetchCollectionInfo() {
35-
+ return;
36-
if (collections_loader_ != nullptr)
37-
return;
38-
collection_error_info_.ClearError();
3929
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
4030
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
4131
@@ -280,6 +280,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -48,7 +38,7 @@
4838

4939
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.cc
5040
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.cc
51-
@@ -137,6 +137,10 @@ AffiliationFetcherDelegate* HashAffiliat
41+
@@ -132,6 +132,10 @@ HashAffiliationFetcher::~HashAffiliation
5242
}
5343

5444
void HashAffiliationFetcher::StartRequest(
@@ -61,7 +51,7 @@
6151
base::OnceCallback<void(FetchResult)> result_callback) {
6252
--- a/components/affiliations/core/browser/hash_affiliation_fetcher.h
6353
+++ b/components/affiliations/core/browser/hash_affiliation_fetcher.h
64-
@@ -40,6 +40,8 @@ class HashAffiliationFetcher : public Af
54+
@@ -39,6 +39,8 @@ class HashAffiliationFetcher : public Af
6555
const std::vector<FacetURI>& facet_uris,
6656
RequestInfo request_info,
6757
base::OnceCallback<void(FetchResult)> result_callback) override;
@@ -80,6 +70,16 @@
8070
// This function is not supposed to be called if the previous operation is not
8171
// finished.
8272
if (state_ == REQUESTING) {
73+
--- a/components/themes/ntp_background_service.cc
74+
+++ b/components/themes/ntp_background_service.cc
75+
@@ -96,6 +96,7 @@ void NtpBackgroundService::Shutdown() {
76+
}
77+
78+
void NtpBackgroundService::FetchCollectionInfo() {
79+
+ return;
80+
if (collections_loader_ != nullptr) {
81+
return;
82+
}
8383
--- a/components/update_client/update_checker.cc
8484
+++ b/components/update_client/update_checker.cc
8585
@@ -104,6 +104,7 @@ void UpdateCheckerImpl::CheckForUpdates(
@@ -92,12 +92,24 @@
9292
update_check_callback_ = std::move(update_check_callback);
9393
--- a/third_party/devtools-frontend/src/front_end/panels/elements/WebCustomData.ts
9494
+++ b/third_party/devtools-frontend/src/front_end/panels/elements/WebCustomData.ts
95-
@@ -19,18 +19,7 @@ export class WebCustomData {
96-
readonly fetchPromiseForTest: Promise<unknown>;
95+
@@ -2,7 +2,6 @@
96+
// Use of this source code is governed by a BSD-style license that can be
97+
// found in the LICENSE file.
98+
99+
-import * as Root from '../../core/root/root.js';
100+
101+
/**
102+
* Lazily loads the vscode.web-custom-data/browser.css-data.json and allows
103+
@@ -15,33 +14,14 @@ import * as Root from '../../core/root/r
104+
export class WebCustomData {
105+
#data = new Map<string, CSSProperty>();
97106

98-
constructor(remoteBase: string) {
107+
- /** The test actually needs to wait for the result */
108+
- readonly fetchPromiseForTest: Promise<unknown>;
109+
-
110+
- constructor(remoteBase: string) {
99111
- if (!remoteBase) {
100-
this.fetchPromiseForTest = Promise.resolve();
112+
- this.fetchPromiseForTest = Promise.resolve();
101113
- return;
102114
- }
103115
- this.fetchPromiseForTest = fetch(`${remoteBase}third_party/vscode.web-custom-data/browsers.css-data.json`)
@@ -108,6 +120,28 @@
108120
- }
109121
- })
110122
- .catch();
123+
- }
124+
-
125+
/**
126+
* Creates a fresh `WebCustomData` instance using the standard
127+
* DevTools remote base.
128+
* Throws if no valid remoteBase was found.
129+
*/
130+
static create(): WebCustomData {
131+
- const remoteBase = Root.Runtime.getRemoteBase();
132+
// Silently skip loading of the CSS data if remoteBase is not set properly.
133+
- return new WebCustomData(remoteBase?.base ?? '');
134+
+ return new WebCustomData();
111135
}
112136

113137
/**
138+
@@ -54,9 +34,6 @@ export class WebCustomData {
139+
}
140+
}
141+
142+
-interface CSSBrowserData {
143+
- properties: CSSProperty[];
144+
-}
145+
146+
export interface CSSProperty {
147+
name: string;

patches/core/ungoogled-chromium/block-trk-and-subdomains.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
url.SchemeIs(dom_distiller::kDomDistillerScheme))
2424
--- a/chrome/browser/ui/singleton_tabs.cc
2525
+++ b/chrome/browser/ui/singleton_tabs.cc
26-
@@ -124,7 +124,8 @@ int GetIndexOfExistingTab(Browser* brows
26+
@@ -132,7 +132,8 @@ int GetIndexOfExistingTab(Browser* brows
2727
// RewriteURLIfNecessary removes the "view-source:" scheme which could lead
2828
// to incorrect matching, so ensure that the target and the candidate are
2929
// either both view-source:, or neither is.
@@ -70,7 +70,7 @@
7070
// other origins, so we should not treat them as web safe. Remove callers of
7171
--- a/net/BUILD.gn
7272
+++ b/net/BUILD.gn
73-
@@ -1081,6 +1081,8 @@ component("net") {
73+
@@ -1094,6 +1094,8 @@ component("net") {
7474
"url_request/static_http_user_agent_settings.cc",
7575
"url_request/static_http_user_agent_settings.h",
7676
"url_request/storage_access_status_cache.h",
@@ -173,15 +173,15 @@
173173
return NetLogURLRequestConstructorParams(url, priority_,
174174
--- a/net/url_request/url_request_context_builder.cc
175175
+++ b/net/url_request/url_request_context_builder.cc
176-
@@ -50,6 +50,7 @@
176+
@@ -53,6 +53,7 @@
177177
#include "net/socket/network_binding_client_socket_factory.h"
178178
#include "net/ssl/ssl_config_service_defaults.h"
179179
#include "net/url_request/static_http_user_agent_settings.h"
180180
+#include "net/url_request/trk_protocol_handler.h"
181181
#include "net/url_request/url_request_context.h"
182182
#include "net/url_request/url_request_job_factory.h"
183183
#include "url/url_constants.h"
184-
@@ -597,6 +598,9 @@ std::unique_ptr<URLRequestContext> URLRe
184+
@@ -612,6 +613,9 @@ std::unique_ptr<URLRequestContext> URLRe
185185
}
186186
protocol_handlers_.clear();
187187

patches/core/ungoogled-chromium/disable-crash-reporter.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
--- a/chrome/browser/chrome_content_browser_client.cc
44
+++ b/chrome/browser/chrome_content_browser_client.cc
5-
@@ -2714,24 +2714,6 @@ void ChromeContentBrowserClient::AppendE
5+
@@ -2752,24 +2752,6 @@ void ChromeContentBrowserClient::AppendE
66
command_line->AppendSwitchASCII(switches::kMetricsClientID,
77
client_info->client_id);
88
}

patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
44
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
5-
@@ -297,7 +297,7 @@ bool DomDistillerViewerSource::ShouldSer
5+
@@ -291,7 +291,7 @@ bool DomDistillerViewerSource::ShouldSer
66
std::string DomDistillerViewerSource::GetContentSecurityPolicy(
77
network::mojom::CSPDirectiveName directive) {
88
if (directive == network::mojom::CSPDirectiveName::StyleSrc) {

patches/core/ungoogled-chromium/disable-google-host-detection.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@
681681
} // namespace variations
682682
--- a/content/browser/preloading/prefetch/prefetch_container.cc
683683
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
684-
@@ -999,7 +999,7 @@ void PrefetchContainer::AddRedirectHop(c
684+
@@ -970,7 +970,7 @@ void PrefetchContainer::AddRedirectHop(c
685685
// some which are added by throttles). These aren't yet supported for
686686
// prefetch, including browsing topics and client hints.
687687
net::HttpRequestHeaders updated_headers;

patches/core/ungoogled-chromium/disable-mei-preload.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212

1313
data_deps += [
1414
- "//chrome/browser/resources/media/mei_preload:component",
15-
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component",
15+
"//components/webapps/isolated_web_apps/preload:component",
1616
"//third_party/widevine/cdm",
1717
]
18-
@@ -1202,7 +1201,6 @@ if (is_win) {
18+
@@ -1206,7 +1205,6 @@ if (is_win) {
1919
":optimization_guide_library",
2020
":swiftshader_binaries",
2121
":widevine_cdm_library",
2222
- "//chrome/browser/resources/media/mei_preload:component_bundle",
23-
"//chrome/browser/web_applications/isolated_web_apps/key_distribution/preload:component_bundle",
23+
"//components/webapps/isolated_web_apps/preload:component_bundle",
2424
]
2525

2626
--- a/chrome/browser/resources/BUILD.gn
2727
+++ b/chrome/browser/resources/BUILD.gn
28-
@@ -88,11 +88,6 @@ group("resources") {
28+
@@ -89,11 +89,6 @@ group("resources") {
2929
public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
3030
}
3131

@@ -36,4 +36,4 @@
3636
- }
3737

3838
if (is_win || is_mac || is_linux || is_chromeos) {
39-
public_deps += [
39+
public_deps += [ "connectors_internals:resources" ]

patches/core/ungoogled-chromium/disable-network-time-tracker.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
--- a/components/network_time/network_time_tracker.cc
77
+++ b/components/network_time/network_time_tracker.cc
8-
@@ -282,7 +282,7 @@ void NetworkTimeTracker::UpdateNetworkTi
8+
@@ -279,7 +279,7 @@ void NetworkTimeTracker::UpdateNetworkTi
99
}
1010

1111
bool NetworkTimeTracker::AreTimeFetchesEnabled() const {

0 commit comments

Comments
 (0)