Skip to content

Commit 176fe36

Browse files
committed
Update to Chromium 136.0.7103.49
1 parent 87bb243 commit 176fe36

File tree

73 files changed

+2612
-2261
lines changed

Some content is hidden

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

73 files changed

+2612
-2261
lines changed

chromium_version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
135.0.7049.114
1+
136.0.7103.49

domain_substitution.list

Lines changed: 489 additions & 401 deletions
Large diffs are not rendered by default.

patches/core/bromite/disable-fetching-field-trials.patch

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,16 @@ Subject: Disable fetching of all field trials
5151
/**
5252
--- a/components/variations/service/variations_service.cc
5353
+++ b/components/variations/service/variations_service.cc
54-
@@ -222,17 +222,7 @@ bool GetInstanceManipulations(const net:
54+
@@ -224,22 +224,7 @@ bool GetInstanceManipulations(const net:
5555
// Variations seed fetching is only enabled in official Chrome builds, if a URL
5656
// is specified on the command line, and for testing.
5757
bool IsFetchingEnabled() {
58-
-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
58+
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
59+
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
60+
- switches::kDisableVariationsSeedFetch)) {
61+
return false;
62+
- }
63+
-#else
5964
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
6065
- switches::kVariationsServerURL) &&
6166
- !g_should_fetch_for_testing) {
@@ -64,9 +69,8 @@ Subject: Disable fetching of all field trials
6469
- << switches::kVariationsServerURL << " specified.";
6570
- return false;
6671
- }
67-
-#endif
72+
-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
6873
- return true;
69-
+ return false;
7074
}
7175

7276
// Returns the already downloaded first run seed, and clear the seed from the

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

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/chrome/browser/BUILD.gn
22
+++ b/chrome/browser/BUILD.gn
3-
@@ -3648,8 +3648,6 @@ static_library("browser") {
3+
@@ -3685,8 +3685,6 @@ static_library("browser") {
44
"download/download_commands.cc",
55
"download/download_crx_util.cc",
66
"download/download_crx_util.h",
@@ -11,7 +11,7 @@
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-
@@ -5405,10 +5405,6 @@ ChromeContentBrowserClient::CreateThrott
14+
@@ -5467,10 +5467,6 @@ ChromeContentBrowserClient::CreateThrott
1515
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
1616
handle, handle->GetWebContents()->GetBrowserContext()));
1717

@@ -94,7 +94,7 @@
9494
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
9595
std::optional<downloads::AcceptDanger::Params> params =
9696
downloads::AcceptDanger::Params::Create(args());
97-
@@ -1418,42 +1414,7 @@ void DownloadsAcceptDangerFunction::Prom
97+
@@ -1430,44 +1426,7 @@ void DownloadsAcceptDangerFunction::Prom
9898
return;
9999
}
100100
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -105,8 +105,10 @@
105105
- base::BindOnce(&DownloadsAcceptDangerFunction::DangerPromptCallback, this,
106106
- download_id));
107107
- // DownloadDangerPrompt deletes itself
108-
- if (on_prompt_created_ && !on_prompt_created_->is_null())
108+
- if (on_prompt_created_ && !on_prompt_created_->is_null()) {
109109
- std::move(*on_prompt_created_).Run(prompt);
110+
- on_prompt_created_ = nullptr;
111+
- }
110112
- // Function finishes in DangerPromptCallback().
111113
-}
112114
-
@@ -235,31 +237,31 @@
235237
std::unique_ptr<std::string> response_body);
236238
--- a/chrome/browser/safe_browsing/BUILD.gn
237239
+++ b/chrome/browser/safe_browsing/BUILD.gn
238-
@@ -8,6 +8,7 @@ import("//components/safe_browsing/build
240+
@@ -7,6 +7,7 @@ import("//components/safe_browsing/build
239241
import("//extensions/buildflags/buildflags.gni")
240242

241243
static_library("safe_browsing") {
242244
+ if (false) {
243245
sources = [
244246
"chrome_controller_client.cc",
245247
"chrome_controller_client.h",
246-
@@ -75,6 +76,7 @@ static_library("safe_browsing") {
248+
@@ -73,6 +74,7 @@ static_library("safe_browsing") {
247249
"//mojo/public/cpp/system",
248250
"//services/preferences/public/cpp",
249251
]
250252
+ }
251253

252-
if (is_android) {
253-
deps += [
254-
@@ -553,6 +555,7 @@ static_library("advanced_protection") {
254+
# Note: is_android is not equivalent to safe_browsing_mode == 2.
255+
# Sources and dependencies added to this block must not depend on anything
256+
@@ -564,6 +566,7 @@ static_library("advanced_protection") {
255257
}
256258

257259
source_set("metrics_collector") {
258260
+ if (false) {
259261
sources = [
260262
"safe_browsing_metrics_collector_factory.cc",
261263
"safe_browsing_metrics_collector_factory.h",
262-
@@ -572,6 +575,7 @@ source_set("metrics_collector") {
264+
@@ -583,6 +586,7 @@ source_set("metrics_collector") {
263265
"//components/safe_browsing/core/common:safe_browsing_prefs",
264266
"//content/public/browser",
265267
]
@@ -312,24 +314,11 @@
312314
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
313315
--- a/chrome/renderer/chrome_content_renderer_client.cc
314316
+++ b/chrome/renderer/chrome_content_renderer_client.cc
315-
@@ -113,7 +113,6 @@
317+
@@ -112,7 +112,6 @@
316318
#include "components/pdf/common/pdf_util.h"
317319
#include "components/permissions/features.h"
318320
#include "components/safe_browsing/buildflags.h"
319321
-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
320322
#include "components/sampling_profiler/process_type.h"
321323
#include "components/sampling_profiler/thread_profiler.h"
322324
#include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
323-
@@ -484,12 +483,8 @@ void ChromeContentRendererClient::Render
324-
thread->AddObserver(fingerprinting_protection_ruleset_dealer_.get());
325-
}
326-
327-
- phishing_model_setter_ =
328-
- std::make_unique<safe_browsing::PhishingModelSetterImpl>();
329-
-
330-
thread->AddObserver(chrome_observer_.get());
331-
thread->AddObserver(subresource_filter_ruleset_dealer_.get());
332-
- thread->AddObserver(phishing_model_setter_.get());
333-
334-
blink::WebScriptController::RegisterExtension(
335-
extensions_v8::LoadTimesExtension::Get());

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-
@@ -888,93 +888,6 @@ std::tuple<GURL, std::string> AutofillCr
3+
@@ -890,93 +890,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 & 3 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-
@@ -410,11 +410,6 @@ void ComponentLoader::AddWebStoreApp() {
13+
@@ -407,11 +407,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-
@@ -485,20 +485,6 @@ void WebstoreInstaller::DownloadNextPend
39+
@@ -488,20 +488,6 @@ void WebstoreInstaller::DownloadNextPend
4040

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

5959
// http://crbug.com/165634
60-
@@ -644,25 +630,6 @@ void WebstoreInstaller::UpdateDownloadPr
60+
@@ -656,25 +642,6 @@ void WebstoreInstaller::UpdateDownloadPr
6161
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
6262
DCHECK_CURRENTLY_ON(BrowserThread::UI);
6363
DCHECK(!crx_installer_.get());

patches/core/inox-patchset/0015-disable-update-pings.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/chrome/updater/configurator.cc
22
+++ b/chrome/updater/configurator.cc
3-
@@ -114,7 +114,7 @@ base::TimeDelta Configurator::UpdateDela
3+
@@ -115,7 +115,7 @@ base::TimeDelta Configurator::UpdateDela
44

55
std::vector<GURL> Configurator::UpdateUrl() const {
66
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

patches/core/inox-patchset/0021-disable-rlz.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
--- a/BUILD.gn
44
+++ b/BUILD.gn
5-
@@ -479,14 +479,6 @@ group("gn_all") {
6-
deps += [ "//chromeos:chromeos_unittests" ]
5+
@@ -477,14 +477,6 @@ group("gn_all") {
6+
]
77
}
88

9-
- if (is_chromeos_ash || is_mac || is_win) {
9+
- if (is_chromeos || is_mac || is_win) {
1010
- deps += [
1111
- "//rlz:rlz_id",
1212
- "//rlz:rlz_lib",
@@ -19,11 +19,11 @@
1919
deps += [
2020
--- a/rlz/buildflags/buildflags.gni
2121
+++ b/rlz/buildflags/buildflags.gni
22-
@@ -7,7 +7,7 @@ import("//build/config/chromeos/ui_mode.
22+
@@ -6,7 +6,7 @@ import("//build/config/chrome_build.gni"
2323

2424
# Whether we are using the rlz library or not. Platforms like Android send
2525
# rlz codes for searches but do not use the library.
26-
-enable_rlz_support = is_win || is_apple || is_chromeos_ash
26+
-enable_rlz_support = is_win || is_apple || is_chromeos
2727
+enable_rlz_support = false
2828

2929
declare_args() {

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ by default.
9090
// once per machine.
9191
--- a/chrome/browser/extensions/install_signer.cc
9292
+++ b/chrome/browser/extensions/install_signer.cc
93-
@@ -64,7 +64,7 @@ const int kSignatureFormatVersion = 2;
93+
@@ -63,7 +63,7 @@ const int kSignatureFormatVersion = 2;
9494
const size_t kSaltBytes = 32;
9595

9696
const char kBackendUrl[] =
@@ -405,7 +405,7 @@ by default.
405405
GURL url(base::WideToUTF16(args[0]));
406406
--- a/extensions/common/extension_urls.cc
407407
+++ b/extensions/common/extension_urls.cc
408-
@@ -39,10 +39,10 @@ const GURL* g_item_snippet_url_for_test_
408+
@@ -38,11 +38,11 @@ const GURL* g_item_snippet_url_for_test_
409409

410410
} // namespace
411411

@@ -415,7 +415,9 @@ by default.
415415
+const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/";
416416
const char kChromeWebstoreUpdateURL[] =
417417
- "https://clients2.google.com/service/update2/crx";
418+
-const char kChromeWebstoreApiURL[] = "https://chromewebstore.googleapis.com/";
418419
+ "trk:05:https://clients2.google.com/service/update2/crx";
420+
+const char kChromeWebstoreApiURL[] = "trk:07:https://chromewebstore.googleapis.com/";
419421

420422
const char kAppMenuUtmSource[] = "ext_app_menu";
421423
const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
@@ -683,7 +685,7 @@ by default.
683685

684686
--- a/rlz/lib/lib_values.cc
685687
+++ b/rlz/lib/lib_values.cc
686-
@@ -40,7 +40,7 @@ const char kSetDccResponseVariable[] = "
688+
@@ -45,7 +45,7 @@ const char kSetDccResponseVariable[] = "
687689
//
688690

689691
const char kFinancialPingPath[] = "/tools/pso/ping";

patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
5656
IncidentReportingService::IncidentReportingService(
5757
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
5858
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
59-
@@ -382,7 +382,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
59+
@@ -378,7 +378,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
6060
}
6161

6262
void SafeBrowsingServiceImpl::RegisterAllDelayedAnalysis() {

0 commit comments

Comments
 (0)