morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 00:14:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium 110.0.5481.77

Browse Source
This commit is contained in:
Blaise
2023-02-01 13:32:18 -06:00
parent 6e4bff50c0
commit e289b9465b
68 changed files with 878 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
109.0.5414.120
110.0.5481.77

433
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2264,7 +2264,6 @@ static_library("browser") {
@@ -2251,7 +2251,6 @@ static_library("browser") {
"//components/reputation/core:proto",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -8,7 +8,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3701,8 +3700,6 @@ static_library("browser") {
@@ -3664,8 +3663,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -19,7 +19,7 @@
"download/download_dir_util.cc",
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -54,10 +54,6 @@ class NetworkQualityTracker;
@@ -55,10 +55,6 @@ class NetworkQualityTracker;
class SharedURLLoaderFactory;
}
@@ -30,7 +30,7 @@
namespace subresource_filter {
class RulesetService;
}
@@ -210,9 +206,6 @@ class BrowserProcess {
@@ -211,9 +207,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -42,7 +42,7 @@
virtual subresource_filter::RulesetService*
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -72,7 +72,6 @@
@@ -71,7 +71,6 @@
#include "chrome/browser/printing/print_preview_dialog_controller.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
@@ -50,7 +50,7 @@
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -408,8 +407,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -419,8 +418,6 @@ void BrowserProcessImpl::StartTearDown()
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1032,14 +1029,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1055,14 +1052,6 @@ StatusTray* BrowserProcessImpl::status_t
return status_tray_.get();
}
@@ -74,7 +74,7 @@
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1278,26 +1267,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1301,26 +1290,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -111,7 +111,7 @@
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
@@ -330,9 +329,6 @@ class BrowserProcessImpl : public Browse
@@ -331,9 +330,6 @@ class BrowserProcessImpl : public Browse
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -144,7 +144,7 @@
browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1029,34 +1029,6 @@ void SetApplicationLocaleOnIOThread(cons
@@ -1035,34 +1035,6 @@ void SetApplicationLocaleOnIOThread(cons
GetIOThreadApplicationLocale() = locale;
}
@@ -179,7 +179,7 @@
#if BUILDFLAG(ENABLE_EXTENSIONS)
AppLoadedInTabSource ClassifyAppLoadedInTabSource(
@@ -4852,14 +4824,9 @@ ChromeContentBrowserClient::CreateThrott
@@ -4916,14 +4888,9 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
handle, handle->GetWebContents()->GetBrowserContext()));
@@ -195,7 +195,7 @@
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
base::BindOnce(
&ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps)));
@@ -4898,16 +4865,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -4962,16 +4929,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -212,7 +212,7 @@
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
throttles.push_back(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
@@ -5153,8 +5110,6 @@ void ChromeContentBrowserClient::Overrid
@@ -5228,8 +5185,6 @@ void ChromeContentBrowserClient::Overrid
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -246,7 +246,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -454,13 +454,6 @@ void ChromeDownloadManagerDelegate::SetD
@@ -455,13 +455,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
@@ -260,7 +260,7 @@
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -825,17 +818,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -826,17 +819,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
@@ -298,7 +298,7 @@
is_being_revived_(false) {}
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -521,13 +521,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -535,13 +535,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -315,7 +315,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -750,9 +750,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -764,9 +764,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -356,7 +356,7 @@
extension.erase(0, 1);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -315,13 +315,6 @@ base::FilePath DownloadTargetDeterminer:
@@ -322,13 +322,6 @@ base::FilePath DownloadTargetDeterminer:
download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
suggested_filename, sniffed_mime_type, default_filename);
@@ -370,7 +370,7 @@
// If no mime type or explicitly specified a name, don't replace file
// extension.
if (sniffed_mime_type.empty() || !suggested_filename.empty())
@@ -1227,30 +1220,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -1268,30 +1261,7 @@ DownloadFileType::DangerLevel DownloadTa
download_->HasUserGesture())
return DownloadFileType::NOT_DANGEROUS;
@@ -404,7 +404,7 @@
absl::optional<base::Time>
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -37,7 +37,6 @@
@@ -36,7 +36,6 @@
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
#include "chrome/browser/download/download_core_service.h"
#include "chrome/browser/download/download_core_service_factory.h"
@@ -412,7 +412,7 @@
#include "chrome/browser/download/download_file_icon_extractor.h"
#include "chrome/browser/download/download_open_prompt.h"
#include "chrome/browser/download/download_prefs.h"
@@ -1361,9 +1360,6 @@ DownloadsAcceptDangerFunction::Downloads
@@ -1360,9 +1359,6 @@ DownloadsAcceptDangerFunction::Downloads
DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
@@ -422,7 +422,7 @@
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::unique_ptr<downloads::AcceptDanger::Params> params(
downloads::AcceptDanger::Params::Create(args()));
@@ -1401,42 +1397,7 @@ void DownloadsAcceptDangerFunction::Prom
@@ -1400,42 +1396,7 @@ void DownloadsAcceptDangerFunction::Prom
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -548,7 +548,7 @@
referrer_entries)));
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -722,18 +722,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -720,18 +720,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -567,7 +567,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1220,55 +1208,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1217,55 +1205,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -635,7 +635,7 @@
- SetSafeBrowsingConfig(
- g_browser_process->safe_browsing_service()->GetV4ProtocolConfig());
- } else {
- base::ThreadTaskRunnerHandle::Get()->PostTask(
- base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
- FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
- return;
- }
@@ -647,7 +647,7 @@
- return;
-
- SendRequest(id);
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(
+ FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN));
}
@@ -696,7 +696,7 @@
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -899,9 +899,6 @@ void ChromeMetricsServiceClient::Registe
@@ -904,9 +904,6 @@ void ChromeMetricsServiceClient::Registe
metrics_service_->RegisterMetricsProvider(
std::make_unique<HttpsEngagementMetricsProvider>());
@@ -708,7 +708,7 @@
std::make_unique<UpgradeMetricsProvider>());
--- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
@@ -131,9 +131,6 @@ void TrialComparisonCertVerifierControll
@@ -132,9 +132,6 @@ void TrialComparisonCertVerifierControll
std::string serialized_report;
if (!report.Serialize(&serialized_report))
return;
@@ -720,7 +720,7 @@
// static
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -92,7 +92,6 @@
@@ -94,7 +94,6 @@
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
#include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
@@ -728,7 +728,7 @@
#include "chrome/browser/sessions/exit_type_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
@@ -629,17 +628,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -628,17 +627,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -776,7 +776,7 @@
if (safe_browsing_mode != 0) {
# "Safe Browsing Basic" files used for safe browsing in full mode
@@ -476,6 +478,7 @@ static_library("advanced_protection") {
@@ -477,6 +479,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -784,7 +784,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -493,6 +496,7 @@ source_set("metrics_collector") {
@@ -494,6 +497,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -794,7 +794,7 @@
source_set("test_support") {
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -168,90 +168,6 @@ bool SecurityStateTabHelper::UsedPolicyI
@@ -168,92 +168,6 @@ bool SecurityStateTabHelper::UsedPolicyI
security_state::MaliciousContentStatus
SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -859,6 +859,10 @@
- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
- case safe_browsing::SB_THREAT_TYPE_BILLING:
- return security_state::MALICIOUS_CONTENT_STATUS_BILLING;
- case safe_browsing::SB_THREAT_TYPE_MANAGED_POLICY_BLOCK:
- return security_state::MALICIOUS_CONTENT_STATUS_MANAGED_POLICY_BLOCK;
- case safe_browsing::SB_THREAT_TYPE_MANAGED_POLICY_WARN:
- return security_state::MALICIOUS_CONTENT_STATUS_MANAGED_POLICY_WARN;
- case safe_browsing::
- DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
- case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE:
@@ -873,8 +877,6 @@
- case safe_browsing::SB_THREAT_TYPE_SUSPICIOUS_SITE:
- case safe_browsing::SB_THREAT_TYPE_APK_DOWNLOAD:
- case safe_browsing::SB_THREAT_TYPE_HIGH_CONFIDENCE_ALLOWLIST:
- case safe_browsing::SB_THREAT_TYPE_ACCURACY_TIPS:
- case safe_browsing::SB_THREAT_TYPE_MANAGED_POLICY:
- // These threat types are not currently associated with
- // interstitials, and thus resources with these threat types are
- // not ever whitelisted or pending whitelisting.
@@ -887,7 +889,7 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4446,7 +4446,6 @@ static_library("ui") {
@@ -4444,7 +4444,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h",
@@ -897,7 +899,7 @@
"views/download/download_item_view.cc",
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -410,22 +410,6 @@ void TabHelpers::AttachTabHelpers(WebCon
@@ -403,22 +403,6 @@ void TabHelpers::AttachTabHelpers(WebCon
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -929,22 +931,26 @@
-#include "chrome/browser/download/download_danger_prompt.h"
#include "chrome/browser/download/download_history.h"
#include "chrome/browser/download/download_item_model.h"
#include "chrome/browser/download/download_prefs.h"
@@ -175,9 +174,6 @@ void DownloadsDOMHandler::SaveDangerousR
#include "chrome/browser/download/download_item_warning_data.h"
@@ -176,13 +175,6 @@ void DownloadsDOMHandler::SaveDangerousR
}
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
- download::DownloadItem* file = GetDownloadByStringId(id);
- if (file)
- if (file) {
- DownloadItemWarningData::AddWarningActionEvent(
- file, DownloadItemWarningData::WarningSurface::DOWNLOADS_PAGE,
- DownloadItemWarningData::WarningAction::KEEP);
- ShowDangerPrompt(file);
- }
}
void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
@@ -350,12 +346,6 @@ void DownloadsDOMHandler::RemoveDownload
@@ -360,12 +352,6 @@ void DownloadsDOMHandler::RemoveDownload
IdSet ids;
for (auto* download : to_remove) {
- if (download->IsDangerous() || download->IsMixedContent()) {
- if (download->IsDangerous() || download->IsInsecure()) {
- // Don't allow users to revive dangerous downloads; just nuke 'em.
- download->Remove();
- continue;
@@ -953,7 +959,7 @@
DownloadItemModel item_model(download);
if (!item_model.ShouldShowInShelf() ||
download->GetState() == download::DownloadItem::IN_PROGRESS) {
@@ -446,44 +436,6 @@ void DownloadsDOMHandler::FinalizeRemova
@@ -456,44 +442,6 @@ void DownloadsDOMHandler::FinalizeRemova
}
}
@@ -981,14 +987,14 @@
- return;
- CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
-
- // If a download is mixed content, validate that first. Is most cases, mixed
- // content warnings will occur first, but in the worst case scenario, we show
- // a dangerous warning twice. That's better than showing a mixed content
- // warning, then dismissing the dangerous download warning. Since mixed
- // content downloads triggering the UI are temporary and rare to begin with,
- // this should very rarely occur.
- if (item->IsMixedContent()) {
- item->ValidateMixedContentDownload();
- // If a download is insecure, validate that first. Is most cases, insecure
- // download warnings will occur first, but in the worst case scenario, we show
- // a dangerous warning twice. That's better than showing an insecure download
- // warning, then dismissing the dangerous download warning. Since insecure
- // downloads triggering the UI are temporary and rare to begin with, this
- // should very rarely occur.
- if (item->IsInsecure()) {
- item->ValidateInsecureDownload();
- return;
- }
-
@@ -1095,10 +1101,37 @@
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
content::WebContents* web_contents) {
const GURL kRequestUrl("https://enterprise-block.example.net");
@@ -353,61 +294,6 @@ std::unique_ptr<EnterpriseWarnPage> Crea
kRequestUrl));
@@ -344,88 +285,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
kRequestUrl));
}
-std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWarnPage(
- content::WebContents* web_contents) {
- const GURL kRequestUrl("https://enterprise-warn.example.net");
-
- auto* ui_manager =
- g_browser_process->safe_browsing_service()->ui_manager().get();
-
- const content::GlobalRenderFrameHostId primary_main_frame_id =
- web_contents->GetPrimaryMainFrame()->GetGlobalId();
- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
- resource.url = kRequestUrl;
- resource.is_subresource = false;
- resource.is_subframe = false;
- resource.threat_type = safe_browsing::SB_THREAT_TYPE_MANAGED_POLICY_WARN;
- resource.render_process_id = primary_main_frame_id.child_id;
- resource.render_frame_id = primary_main_frame_id.frame_routing_id;
- resource.threat_source = g_browser_process->safe_browsing_service()
- ->database_manager()
- ->GetThreatSource();
-
- return std::make_unique<EnterpriseWarnPage>(
- ui_manager, web_contents, kRequestUrl,
- safe_browsing::SafeBrowsingBlockingPage::UnsafeResourceList({resource}),
- std::make_unique<EnterpriseWarnControllerClient>(web_contents,
- kRequestUrl));
-}
-
-std::unique_ptr<TestSafeBrowsingBlockingPageQuiet>
-CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
- safe_browsing::SBThreatType threat_type =
@@ -1157,7 +1190,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -514,8 +400,6 @@ void InterstitialHTMLSource::StartDataRe
@@ -532,12 +391,8 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1165,8 +1198,12 @@
- interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents);
} else if (path_without_query == "/enterprise-block") {
interstitial_delegate = CreateEnterpriseBlockPage(web_contents);
} else if (path_without_query == "/enterprise-warn") {
@@ -534,16 +418,12 @@ void InterstitialHTMLSource::StartDataRe
- } else if (path_without_query == "/enterprise-warn") {
- interstitial_delegate = CreateEnterpriseWarnPage(web_contents);
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -552,16 +407,12 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
}

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

@@ -10,7 +10,7 @@
extension_misc::kAssessmentAssistantExtensionId,
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -364,11 +364,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -361,11 +361,6 @@ void ComponentLoader::AddWebStoreApp() {
if (!IsNormalSession())
return;
#endif
@@ -36,7 +36,7 @@
{
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -540,20 +540,6 @@ void WebstoreInstaller::DownloadNextPend
@@ -537,20 +537,6 @@ void WebstoreInstaller::DownloadNextPend
void WebstoreInstaller::DownloadCrx(
const std::string& extension_id,
InstallSource source) {
@@ -50,14 +50,14 @@
- base::FilePath download_directory(g_download_directory_for_tests ?
- *g_download_directory_for_tests : download_path);
-
- base::PostTaskAndReplyWithResult(
- GetExtensionFileTaskRunner().get(), FROM_HERE,
- GetExtensionFileTaskRunner()->PostTaskAndReplyWithResult(
- FROM_HERE,
- base::BindOnce(&GetDownloadFilePath, download_directory, extension_id),
- base::BindOnce(&WebstoreInstaller::StartDownload, this, extension_id));
}
// http://crbug.com/165634
@@ -701,25 +687,6 @@ void WebstoreInstaller::UpdateDownloadPr
@@ -698,25 +684,6 @@ void WebstoreInstaller::UpdateDownloadPr
void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK(!crx_installer_.get());

2
patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
View File

@@ -1,6 +1,6 @@
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -153,10 +153,10 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -156,10 +156,10 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;

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

@@ -1,6 +1,6 @@
--- a/chrome/updater/configurator.cc
+++ b/chrome/updater/configurator.cc
@@ -83,7 +83,7 @@ int Configurator::UpdateDelay() const {
@@ -90,7 +90,7 @@ base::TimeDelta Configurator::UpdateDela
}
std::vector<GURL> Configurator::UpdateUrl() const {

2
patches/core/inox-patchset/0021-disable-rlz.patch
View File

@@ -2,7 +2,7 @@
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -470,14 +470,6 @@ group("gn_all") {
@@ -461,14 +461,6 @@ group("gn_all") {
deps += [ "//chromeos:chromeos_unittests" ]
}

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

@@ -178,7 +178,7 @@ by default.
DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr;
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -279,7 +279,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -277,7 +277,7 @@ GURL SpellcheckHunspellDictionary::GetDi
DCHECK(!bdict_file.empty());
static const char kDownloadServerUrl[] =
@@ -200,7 +200,7 @@ by default.
--- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
+++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
@@ -49,7 +49,7 @@ const char* kUpdateBrowserRedirectUrl =
@@ -42,7 +42,7 @@ const char* kUpdateBrowserRedirectUrl =
#else
// The URL to be used to re-install Chrome when auto-update failed for
// too long.
@@ -282,7 +282,7 @@ by default.
std::wstring protocol_url = L"microsoft-edge:" + url;
--- a/chromecast/crash/linux/minidump_uploader.cc
+++ b/chromecast/crash/linux/minidump_uploader.cc
@@ -41,7 +41,7 @@ namespace {
@@ -40,7 +40,7 @@ namespace {
const char kProductName[] = "Eureka";

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

@@ -16,7 +16,7 @@ the URL so we get notified if this happens again in the future).
--- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
+++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc
@@ -35,8 +35,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
@@ -39,8 +39,7 @@ ChromeSafeBrowsingBlockingPageFactory::C
Profile::FromBrowserContext(web_contents->GetBrowserContext());
// Create appropriate display options for this blocking page.
PrefService* prefs = profile->GetPrefs();
@@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future).
kSafeBrowsingIncidentTrafficAnnotation =
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -306,11 +306,14 @@ IncidentReportingService::UploadContext:
@@ -304,11 +304,14 @@ IncidentReportingService::UploadContext:
// static
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
@@ -56,7 +56,7 @@ the URL so we get notified if this happens again in the future).
IncidentReportingService::IncidentReportingService(
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -282,7 +282,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -299,7 +299,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {

2
patches/core/ungoogled-chromium/block-requests.patch
View File

@@ -45,7 +45,7 @@
collection_error_info_.ClearError();
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -286,6 +286,7 @@ GURL SpellcheckHunspellDictionary::GetDi
@@ -284,6 +284,7 @@ GURL SpellcheckHunspellDictionary::GetDi
}
void SpellcheckHunspellDictionary::DownloadDictionary(GURL url) {

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

@@ -35,7 +35,7 @@
--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -573,7 +573,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -574,7 +574,8 @@ void AutocompleteInput::ParseForEmphasiz
// For the view-source and blob schemes, we should emphasize the host of the
// URL qualified by the view-source or blob prefix.
if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
@@ -70,7 +70,7 @@
// other origins, so we should not treat them as web safe. Remove callers of
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1016,6 +1016,8 @@ component("net") {
@@ -1021,6 +1021,8 @@ component("net") {
"url_request/report_sender.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -149,8 +149,8 @@
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -45,6 +46,7 @@
#include "base/task/single_thread_task_runner.h"
@@ -46,6 +47,7 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -158,9 +158,9 @@
namespace net {
@@ -593,6 +595,12 @@ URLRequest::URLRequest(const GURL& url,
@@ -594,6 +596,12 @@ URLRequest::URLRequest(const GURL& url,
// Sanity check out environment.
DCHECK(base::ThreadTaskRunnerHandle::IsSet());
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
+ if (!url.SchemeIs(url::kTraceScheme) &&
+ base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) {
@@ -173,7 +173,7 @@
return NetLogURLRequestConstructorParams(url, priority_,
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -48,6 +48,7 @@
@@ -47,6 +47,7 @@
#include "net/socket/network_binding_client_socket_factory.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/url_request/static_http_user_agent_settings.h"
@@ -181,7 +181,7 @@
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
#include "net/url_request/url_request_throttler_manager.h"
@@ -573,6 +574,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -572,6 +573,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();

6
patches/core/ungoogled-chromium/disable-crash-reporter.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2476,7 +2476,8 @@ void ChromeContentBrowserClient::AppendE
@@ -2519,7 +2519,8 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
@@ -29,7 +29,7 @@
const base::FilePath& exe_path,
--- a/components/gwp_asan/client/gwp_asan.cc
+++ b/components/gwp_asan/client/gwp_asan.cc
@@ -133,6 +133,11 @@ size_t AllocationSamplingFrequency(const
@@ -134,6 +134,11 @@ size_t AllocationSamplingFrequency(const
// Exported for testing.
GWP_ASAN_EXPORT absl::optional<AllocatorSettings> GetAllocatorSettings(
@@ -43,7 +43,7 @@
if (!base::FeatureList::IsEnabled(feature))
--- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
@@ -733,8 +733,6 @@ void CrashpadClient::CrashWithoutDump(co
@@ -735,8 +735,6 @@ void CrashpadClient::CrashWithoutDump(co
// static
void CrashpadClient::SetFirstChanceExceptionHandler(
FirstChanceHandler handler) {

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

@@ -576,7 +576,7 @@
} // namespace variations
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -474,27 +474,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -485,27 +485,6 @@ bool HasGoogleHost(const GURL& url) {
}
bool IsGoogleHost(base::StringPiece host) {

4
patches/core/ungoogled-chromium/disable-mei-preload.patch
View File

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -368,7 +368,6 @@ if (!is_android && !is_mac) {
@@ -371,7 +371,6 @@ if (!is_android && !is_mac) {
}
data_deps += [
@@ -15,7 +15,7 @@
"//third_party/widevine/cdm",
]
}
@@ -1185,7 +1184,6 @@ if (is_win) {
@@ -1188,7 +1187,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_library",
":widevine_cdm_library",

94
patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
View File

@@ -1,30 +1,35 @@
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -69,21 +69,6 @@
sub-label="$i18n{permissionsPageDescription}"
on-click="onPermissionsPageClick_"
role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
- <template is="dom-if" if="[[!isPrivacySandboxRestricted_]]">
- <cr-link-row id="privacySandboxLinkRow"
- start-icon="settings20:experiment"
- class="hr"
- label="$i18n{privacySandboxTitle}"
- sub-label="[[computePrivacySandboxSublabel_(
- prefs.privacy_sandbox.*)]]"
- on-click="onPrivacySandboxClick_"
- external
- role-description="$i18n{subpageArrowRoleDescription}">
- </cr-link-row>
- <a id="privacySandboxLink" href="privacySandbox"
- target="_blank" tabindex="-1" aria-disabled="true"
- role="none"></a>
- </template>
</div>
--- a/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
+++ b/chrome/browser/privacy_sandbox/privacy_sandbox_settings_delegate.cc
@@ -14,25 +14,7 @@
namespace {
<if expr="use_nss_certs">
bool PrivacySandboxRestrictedByAcccountCapability(Profile* profile) {
- auto* identity_manager = IdentityManagerFactory::GetForProfile(profile);
-
- if (!identity_manager ||
- !identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSignin)) {
- // The user isn't signed in so we can't apply any capabilties-based
- // restrictions.
- return false;
- }
-
- const auto core_account_info =
- identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin);
- const AccountInfo account_info =
- identity_manager->FindExtendedAccountInfo(core_account_info);
- auto capability =
- account_info.capabilities.can_run_chrome_privacy_sandbox_trials();
-
- // The Privacy Sandbox is not considered restricted unless the capability
- // has a definitive false signal.
- return capability == signin::Tribool::kFalse;
+ return true;
}
} // namespace
--- a/components/privacy_sandbox/privacy_sandbox_prefs.cc
+++ b/components/privacy_sandbox/privacy_sandbox_prefs.cc
@@ -66,7 +66,7 @@ namespace privacy_sandbox {
@@ -87,7 +87,7 @@ namespace privacy_sandbox {
void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(
@@ -32,10 +37,10 @@
+ prefs::kPrivacySandboxApisEnabled, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
registry->RegisterBooleanPref(prefs::kPrivacySandboxApisEnabledV2, false);
registry->RegisterBooleanPref(
registry->RegisterBooleanPref(prefs::kPrivacySandboxM1ConsentDecisionMade,
--- a/components/privacy_sandbox/privacy_sandbox_settings.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings.cc
@@ -335,45 +335,10 @@ bool PrivacySandboxSettings::IsPrivateAg
@@ -354,26 +354,10 @@ bool PrivacySandboxSettings::IsPrivateAg
}
bool PrivacySandboxSettings::IsPrivacySandboxEnabled() const {
@@ -43,42 +48,23 @@
- if (delegate_->IsPrivacySandboxRestricted())
- return false;
-
- if (delegate_->IsIncognitoProfile())
- return false;
-
- // For Measurement and Relevance APIs, we explicitly do not require the
- // underlying pref to be enabled if there is a local flag enabling the APIs to
- // allow for local testing.
- bool should_override_setting_for_local_testing = base::FeatureList::IsEnabled(
- privacy_sandbox::kOverridePrivacySandboxSettingsLocalTesting);
-
- // Which preference is consulted is dependent on whether release 3 of the
- // settings is available.
- if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
- // For Privacy Sandbox Settings 3, APIs are disabled in incognito.
- if (incognito_profile_)
- return false;
-
- if (should_override_setting_for_local_testing) {
- return true;
- }
-
- // For Privacy Sandbox Settings 3, APIs may be restricted via the delegate.
- // The V2 pref was introduced with the 3rd Privacy Sandbox release.
- return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabledV2);
- if (base::FeatureList::IsEnabled(
- privacy_sandbox::kOverridePrivacySandboxSettingsLocalTesting)) {
- return true;
- }
-
- if (should_override_setting_for_local_testing)
- return true;
-
- return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabled);
- return pref_service_->GetBoolean(prefs::kPrivacySandboxApisEnabledV2);
+ return false;
}
void PrivacySandboxSettings::SetPrivacySandboxEnabled(bool enabled) {
- // Only apply the decision to the appropriate preference.
- if (base::FeatureList::IsEnabled(privacy_sandbox::kPrivacySandboxSettings3)) {
- pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled);
- } else {
- pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabled, enabled);
- }
- pref_service_->SetBoolean(prefs::kPrivacySandboxApisEnabledV2, enabled);
}
bool PrivacySandboxSettings::IsTrustTokensAllowed() {
@@ -92,7 +78,7 @@
+ base::FEATURE_DISABLED_BY_DEFAULT);
const base::FeatureParam<std::string>
kPrivacySandboxAggregationServiceTrustedServerUrlParam{
kPrivacySandboxAggregationServiceTrustedServerUrlAwsParam{
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -122,7 +122,7 @@ BASE_FEATURE(kBlockingDownloadsInAdFrame

2
patches/core/ungoogled-chromium/disable-signin.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -588,32 +588,6 @@ void ShowFirmwareUpdatesApp(Profile* pro
@@ -589,32 +589,6 @@ void ShowFirmwareUpdatesApp(Profile* pro
void ShowBrowserSignin(Browser* browser,
signin_metrics::AccessPoint access_point,
signin::ConsentLevel consent_level) {

27
patches/core/ungoogled-chromium/disable-webstore-urls.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -571,12 +571,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -574,12 +574,6 @@ std::vector<url::Origin> ChromeContentBr
GetOriginsRequiringDedicatedProcess() {
std::vector<url::Origin> list;
@@ -17,7 +17,7 @@
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -289,17 +289,7 @@ bool ChromeContentVerifierDelegate::IsFr
@@ -287,17 +287,7 @@ bool ChromeContentVerifierDelegate::IsFr
// between which extensions are considered in-store.
// See https://crbug.com/766806 for details.
if (!InstallVerifier::IsFromStore(extension, context_)) {
@@ -108,7 +108,7 @@
bool ShouldRetryRequest(const network::SimpleURLLoader* loader) {
DCHECK(loader);
@@ -345,10 +336,6 @@ void ExtensionDownloader::DoStartAllPend
@@ -342,10 +333,6 @@ void ExtensionDownloader::DoStartAllPend
AddToFetches(fetches_preparing, std::move(task));
pending_tasks_.clear();
@@ -119,18 +119,7 @@
}
void ExtensionDownloader::SetIdentityManager(
@@ -377,9 +364,7 @@ ManifestFetchData* ExtensionDownloader::
void ExtensionDownloader::UpdateURLStats(const GURL& update_url,
Manifest::Type extension_type) {
- if (update_url.DomainIs(kGoogleDotCom)) {
- url_stats_.google_url_count++;
- } else if (update_url.is_empty()) {
+ if (update_url.is_empty()) {
url_stats_.no_url_count++;
} else {
url_stats_.other_url_count++;
@@ -416,11 +401,6 @@ bool ExtensionDownloader::AddExtensionDa
@@ -381,11 +368,6 @@ bool ExtensionDownloader::AddExtensionDa
return false;
}
@@ -142,8 +131,8 @@
// Skip extensions with empty IDs.
if (task.id.empty()) {
DLOG(WARNING) << "Found extension with empty ID";
@@ -431,7 +411,7 @@ bool ExtensionDownloader::AddExtensionDa
UpdateURLStats(task.update_url, task.type);
@@ -395,7 +377,7 @@ bool ExtensionDownloader::AddExtensionDa
if (task.update_url.is_empty()) {
// Fill in default update URL.
- task.update_url = extension_urls::GetWebstoreUpdateUrl();
@@ -151,7 +140,7 @@
}
DCHECK(!task.update_url.is_empty());
@@ -846,20 +826,6 @@ void ExtensionDownloader::HandleManifest
@@ -792,20 +774,6 @@ void ExtensionDownloader::HandleManifest
update.second->info);
}
@@ -172,7 +161,7 @@
ExtensionIdSet extension_ids_with_errors;
for (const auto& failure : failures)
extension_ids_with_errors.insert(failure.first.id);
@@ -1443,11 +1409,7 @@ bool ExtensionDownloader::IterateFetchCr
@@ -1389,11 +1357,7 @@ bool ExtensionDownloader::IterateFetchCr
// fetch.
switch (fetch->credentials) {
case ExtensionFetch::CREDENTIALS_NONE:

4
patches/core/ungoogled-chromium/doh-changes.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -357,12 +357,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
@@ -353,12 +353,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
// Enable DNS over HTTPS (DoH).
BASE_FEATURE(kDnsOverHttps,
"DnsOverHttps",
@@ -50,7 +50,7 @@
DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT),
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -101,12 +101,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
@@ -95,12 +95,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
// Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
BASE_FEATURE(kDnsOverHttpsUpgrade,
"DnsOverHttpsUpgrade",

10
patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
View File

@@ -12,16 +12,6 @@
# Linux
executable("chromedriver_server.unstripped") {
testonly = true
--- a/components/optimization_guide/core/BUILD.gn
+++ b/components/optimization_guide/core/BUILD.gn
@@ -77,7 +77,6 @@ static_library("model_executor") {
}
deps = [
":features",
- ":machine_learning",
"//base",
"//components/optimization_guide/proto:optimization_guide_proto",
"//net",
--- a/third_party/devtools-frontend/src/BUILD.gn
+++ b/third_party/devtools-frontend/src/BUILD.gn
@@ -13,7 +13,6 @@ import("./third_party/blink/public/publi

209
patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -619,8 +619,6 @@ static_library("browser") {
@@ -613,8 +613,6 @@ static_library("browser") {
"internal_auth.h",
"interstitials/chrome_settings_page_helper.cc",
"interstitials/chrome_settings_page_helper.h",
@@ -11,7 +11,7 @@
"invalidation/profile_invalidation_provider_factory.cc",
"invalidation/profile_invalidation_provider_factory.h",
"k_anonymity_service/k_anonymity_service_client.cc",
@@ -3725,10 +3723,6 @@ static_library("browser") {
@@ -3688,10 +3686,6 @@ static_library("browser") {
"enterprise/connectors/analysis/analysis_service_settings.h",
"enterprise/connectors/analysis/analysis_settings.cc",
"enterprise/connectors/analysis/analysis_settings.h",
@@ -22,7 +22,7 @@
"enterprise/connectors/analysis/content_analysis_dialog.cc",
"enterprise/connectors/analysis/content_analysis_dialog.h",
"enterprise/connectors/analysis/content_analysis_downloads_delegate.cc",
@@ -4008,10 +4002,6 @@ static_library("browser") {
@@ -3958,10 +3952,6 @@ static_library("browser") {
"new_tab_page/modules/recipes/recipes_service_factory.h",
"new_tab_page/modules/recipes/time_format_util.cc",
"new_tab_page/modules/recipes/time_format_util.h",
@@ -33,7 +33,7 @@
"new_tab_page/new_tab_page_util.cc",
"new_tab_page/new_tab_page_util.h",
"new_tab_page/one_google_bar/one_google_bar_data.cc",
@@ -4456,7 +4446,6 @@ static_library("browser") {
@@ -4402,7 +4392,6 @@ static_library("browser") {
"//chrome/browser/new_tab_page/modules/feed:mojo_bindings",
"//chrome/browser/new_tab_page/modules/photos:mojo_bindings",
"//chrome/browser/new_tab_page/modules/recipes:mojo_bindings",
@@ -41,7 +41,7 @@
"//chrome/browser/policy:path_parser",
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
@@ -7876,9 +7865,14 @@ static_library("browser") {
@@ -7889,9 +7878,14 @@ static_library("browser") {
"//components/safe_browsing/content/browser:safe_browsing_blocking_page",
"//components/safe_browsing/content/browser/download:download_stats",
"//components/safe_browsing/content/common:file_type_policies",
@@ -57,23 +57,9 @@
if (build_with_tflite_lib) {
sources += [
--- a/chrome/browser/accuracy_tips/accuracy_service_factory.cc
+++ b/chrome/browser/accuracy_tips/accuracy_service_factory.cc
@@ -46,10 +46,7 @@ KeyedService* AccuracyServiceFactory::Bu
content::BrowserContext* browser_context) const {
DCHECK(base::FeatureList::IsEnabled(safe_browsing::kAccuracyTipsFeature));
Profile* profile = Profile::FromBrowserContext(browser_context);
- auto sb_database =
- g_browser_process->safe_browsing_service()
- ? g_browser_process->safe_browsing_service()->database_manager()
- : nullptr;
+ auto sb_database = nullptr;
auto* history_service = HistoryServiceFactory::GetForProfile(
profile, ServiceAccessType::IMPLICIT_ACCESS);
auto delegate = std::make_unique<AccuracyServiceDelegate>(profile);
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -4866,11 +4866,13 @@ ChromeContentBrowserClient::CreateThrott
@@ -4930,11 +4930,13 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -87,7 +73,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -6288,26 +6290,7 @@ ChromeContentBrowserClient::GetSafeBrows
@@ -6422,26 +6424,7 @@ ChromeContentBrowserClient::GetSafeBrows
const std::vector<std::string>& allowlist_domains) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -115,7 +101,7 @@
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -6328,11 +6311,6 @@ ChromeContentBrowserClient::GetUrlLookup
@@ -6462,11 +6445,6 @@ ChromeContentBrowserClient::GetUrlLookup
GetForProfile(profile);
}
#endif
@@ -129,7 +115,7 @@
--- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
+++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
@@ -143,34 +143,6 @@ void MaybeCreateSafeBrowsingForRenderer(
@@ -141,34 +141,6 @@ void MaybeCreateSafeBrowsingForRenderer(
const std::vector<std::string>& allowlist_domains)>
get_checker_delegate,
mojo::PendingReceiver<safe_browsing::mojom::SafeBrowsing> receiver) {
@@ -162,8 +148,8 @@
- allowlist_domains),
- std::move(receiver)));
}
#endif
// BadgeManager is not used for Android.
--- a/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
+++ b/chrome/browser/component_updater/chrome_client_side_phishing_component_installer.cc
@@ -29,20 +29,6 @@ namespace {
@@ -209,8 +195,8 @@
#include "third_party/blink/public/common/renderer_preferences/renderer_preferences.h"
--- a/chrome/browser/download/bubble/download_bubble_controller.cc
+++ b/chrome/browser/download/bubble/download_bubble_controller.cc
@@ -402,8 +402,6 @@ void DownloadBubbleUIController::Process
ProcessDownloadWarningButtonPress(model, command);
@@ -400,8 +400,6 @@ void DownloadBubbleUIController::Process
commands.ExecuteCommand(command);
break;
case DownloadCommands::REVIEW:
- model->ReviewScanningVerdict(
@@ -220,7 +206,7 @@
RetryDownload(model, command);
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -132,7 +132,6 @@ using content::DownloadManager;
@@ -133,7 +133,6 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -228,7 +214,7 @@
using safe_browsing::DownloadProtectionService;
using ConnectionType = net::NetworkChangeNotifier::ConnectionType;
@@ -1502,7 +1501,6 @@ void ChromeDownloadManagerDelegate::OnDo
@@ -1503,7 +1502,6 @@ void ChromeDownloadManagerDelegate::OnDo
DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info->target_path, target_info->is_filetype_handled_safely);
@@ -236,7 +222,7 @@
}
if (ShouldBlockFile(item, target_info->danger_type)) {
MaybeReportDangerousDownloadBlocked(
@@ -1581,56 +1579,6 @@ bool ChromeDownloadManagerDelegate::IsOp
@@ -1582,56 +1580,6 @@ bool ChromeDownloadManagerDelegate::IsOp
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item,
download::DownloadDangerType danger_type) const {
@@ -293,7 +279,7 @@
return false;
}
@@ -1645,7 +1593,6 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1646,7 +1594,6 @@ void ChromeDownloadManagerDelegate::Mayb
service->MaybeSendDangerousDownloadOpenedReport(download,
show_download_in_folder);
}
@@ -301,7 +287,7 @@
if (!download->GetAutoOpened()) {
download::DownloadContent download_content =
download::DownloadContentFromMimeType(download->GetMimeType(), false);
@@ -1653,6 +1600,7 @@ void ChromeDownloadManagerDelegate::Mayb
@@ -1654,6 +1601,7 @@ void ChromeDownloadManagerDelegate::Mayb
download->GetDangerType(), download_content, base::Time::Now(),
download->GetEndTime(), show_download_in_folder);
}
@@ -309,7 +295,7 @@
}
void ChromeDownloadManagerDelegate::CheckDownloadAllowed(
@@ -1710,8 +1658,7 @@ void ChromeDownloadManagerDelegate::Chec
@@ -1711,8 +1659,7 @@ void ChromeDownloadManagerDelegate::Chec
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -321,7 +307,7 @@
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -939,100 +939,10 @@ void DownloadItemModel::ExecuteCommand(D
@@ -962,100 +962,10 @@ void DownloadItemModel::ExecuteCommand(D
DownloadItemModel::BubbleUIInfo
DownloadItemModel::GetBubbleUIInfoForTailoredWarning() const {
@@ -445,7 +431,7 @@
void RecordOpenedDangerousConfirmDialog(
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -982,12 +982,14 @@ void DownloadTargetDeterminer::CheckVisi
@@ -989,12 +989,14 @@ void DownloadTargetDeterminer::CheckVisi
bool visited_referrer_before) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_);
@@ -460,7 +446,7 @@
danger_level_ = GetDangerLevel(
visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
@@ -1225,6 +1227,7 @@ DownloadFileType::DangerLevel DownloadTa
@@ -1266,6 +1268,7 @@ DownloadFileType::DangerLevel DownloadTa
absl::optional<base::Time>
DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const {
@@ -468,7 +454,7 @@
safe_browsing::SafeBrowsingMetricsCollector* metrics_collector =
safe_browsing::SafeBrowsingMetricsCollectorFactory::GetForProfile(
GetProfile());
@@ -1233,6 +1236,9 @@ DownloadTargetDeterminer::GetLastDownloa
@@ -1274,6 +1277,9 @@ DownloadTargetDeterminer::GetLastDownloa
safe_browsing::SafeBrowsingMetricsCollector::
EventType::DANGEROUS_DOWNLOAD_BYPASS)
: absl::nullopt;
@@ -520,7 +506,7 @@
}
--- a/chrome/browser/enterprise/connectors/connectors_service.cc
+++ b/chrome/browser/enterprise/connectors/connectors_service.cc
@@ -446,19 +446,6 @@ absl::optional<std::string> ConnectorsSe
@@ -410,19 +410,6 @@ absl::optional<std::string> ConnectorsSe
return absl::nullopt;
}
@@ -542,7 +528,7 @@
}
--- a/chrome/browser/enterprise/connectors/connectors_service.h
+++ b/chrome/browser/enterprise/connectors/connectors_service.h
@@ -98,12 +98,6 @@ class ConnectorsService : public KeyedSe
@@ -93,12 +93,6 @@ class ConnectorsService : public KeyedSe
// is no token to use.
absl::optional<std::string> GetDMTokenForRealTimeUrlCheck() const;
@@ -738,7 +724,7 @@
} // namespace utils
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -305,10 +305,6 @@ static_library("extensions") {
@@ -299,10 +299,6 @@ static_library("extensions") {
"api/runtime/chrome_runtime_api_delegate.h",
"api/safe_browsing_private/safe_browsing_private_api.cc",
"api/safe_browsing_private/safe_browsing_private_api.h",
@@ -749,7 +735,7 @@
"api/safe_browsing_private/safe_browsing_util.cc",
"api/safe_browsing_private/safe_browsing_util.h",
"api/search/search_api.cc",
@@ -639,8 +635,6 @@ static_library("extensions") {
@@ -635,8 +631,6 @@ static_library("extensions") {
"menu_manager_factory.h",
"navigation_observer.cc",
"navigation_observer.h",
@@ -758,6 +744,16 @@
"pack_extension_job.cc",
"pack_extension_job.h",
"pending_extension_info.cc",
--- a/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
@@ -87,7 +87,6 @@ void EnsureApiBrowserContextKeyedService
extensions::PasswordsPrivateEventRouterFactory::GetInstance();
extensions::PreferenceAPI::GetFactoryInstance();
extensions::ProcessesAPI::GetFactoryInstance();
- extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance();
extensions::SessionsAPI::GetFactoryInstance();
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -285,21 +285,6 @@ void CookiesGetFunction::GetCookieListCa
@@ -829,19 +825,9 @@
info.browser_version = std::move(signals.browser_version);
info.built_in_dns_client_enabled = signals.built_in_dns_client_enabled;
info.enterprise_profile_id = signals.enterprise_profile_id;
--- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -117,7 +117,6 @@ void EnsureBrowserContextKeyedServiceFac
#endif
extensions::PreferenceAPI::GetFactoryInstance();
extensions::ProcessesAPI::GetFactoryInstance();
- extensions::SafeBrowsingPrivateEventRouterFactory::GetInstance();
extensions::SessionsAPI::GetFactoryInstance();
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -658,56 +658,17 @@ void ChromeExtensionsBrowserClient::Noti
@@ -666,56 +666,17 @@ void ChromeExtensionsBrowserClient::Noti
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::string& code) const {
@@ -901,7 +887,7 @@
// static
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -53,7 +53,6 @@
@@ -52,7 +52,6 @@
#include "chrome/browser/extensions/forced_extensions/install_stage_tracker.h"
#include "chrome/browser/extensions/install_verifier.h"
#include "chrome/browser/extensions/installed_loader.h"
@@ -909,7 +895,7 @@
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "chrome/browser/extensions/shared_module_service.h"
@@ -193,7 +192,6 @@ void ExtensionService::BlocklistExtensio
@@ -192,7 +191,6 @@ void ExtensionService::BlocklistExtensio
blocklist_prefs::SetSafeBrowsingExtensionBlocklistState(
extension_id, BitMapBlocklistState::BLOCKLISTED_MALWARE,
extension_prefs_);
@@ -917,7 +903,7 @@
}
bool ExtensionService::OnExternalExtensionUpdateUrlFound(
@@ -359,9 +357,6 @@ ExtensionService::ExtensionService(Profi
@@ -358,9 +356,6 @@ ExtensionService::ExtensionService(Profi
safe_browsing_verdict_handler_(extension_prefs,
ExtensionRegistry::Get(profile),
this),
@@ -927,7 +913,7 @@
registry_(ExtensionRegistry::Get(profile)),
pending_extension_manager_(profile),
install_directory_(install_directory),
@@ -862,100 +857,6 @@ bool ExtensionService::IsExtensionEnable
@@ -858,100 +853,6 @@ bool ExtensionService::IsExtensionEnable
return extension_registrar_.IsExtensionEnabled(extension_id);
}
@@ -1038,7 +1024,7 @@
#include "chrome/browser/extensions/pending_extension_manager.h"
#include "chrome/browser/extensions/safe_browsing_verdict_handler.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -276,40 +275,11 @@ class ExtensionService : public Extensio
@@ -278,40 +277,11 @@ class ExtensionService : public Extensio
// nothing.
void EnableExtension(const std::string& extension_id);
@@ -1079,7 +1065,7 @@
// Disables the extension. If the extension is already disabled, just adds
// the |disable_reasons| (a bitmask of disable_reason::DisableReason - there
// can be multiple DisableReasons e.g. when an extension comes in disabled
@@ -651,8 +621,6 @@ class ExtensionService : public Extensio
@@ -655,8 +625,6 @@ class ExtensionService : public Extensio
SafeBrowsingVerdictHandler safe_browsing_verdict_handler_;
@@ -1144,7 +1130,7 @@
#include "chrome/browser/ui/file_system_access_dialogs.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pdf_util.h"
@@ -330,85 +328,6 @@ bool ShouldBlockAccessToPath(const base:
@@ -336,85 +334,6 @@ bool ShouldBlockAccessToPath(const base:
return true;
}
@@ -1230,7 +1216,7 @@
std::string GenerateLastPickedDirectoryKey(const std::string& id) {
return id.empty() ? kDefaultLastPickedDirectoryKey
: base::StrCat({kCustomLastPickedDirectoryKey, "-", id});
@@ -428,13 +347,7 @@ base::StringPiece GetGrantKeyFromGrantTy
@@ -434,13 +353,7 @@ base::StringPiece GetGrantKeyFromGrantTy
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -1245,7 +1231,7 @@
}
} // namespace
@@ -1249,29 +1162,6 @@ void ChromeFileSystemAccessPermissionCon
@@ -1257,29 +1170,6 @@ void ChromeFileSystemAccessPermissionCon
std::move(callback));
}
@@ -1332,15 +1318,15 @@
NotificationHandler::Type::EXTENSION,
--- a/chrome/browser/password_manager/chrome_password_manager_client.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -36,7 +36,6 @@
#include "chrome/browser/password_manager/password_scripts_fetcher_factory.h"
@@ -35,7 +35,6 @@
#include "chrome/browser/password_manager/password_reuse_manager_factory.h"
#include "chrome/browser/password_manager/password_store_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#include "chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service.h"
#include "chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_factory.h"
#include "chrome/browser/safe_browsing/extension_telemetry/password_reuse_signal.h"
@@ -961,6 +960,7 @@ autofill::LanguageCode ChromePasswordMan
@@ -904,6 +903,7 @@ autofill::LanguageCode ChromePasswordMan
return autofill::LanguageCode();
}
@@ -1348,7 +1334,7 @@
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
return safe_browsing::ChromePasswordProtectionService::
@@ -1034,13 +1034,9 @@ void ChromePasswordManagerClient::CheckP
@@ -977,13 +977,9 @@ void ChromePasswordManagerClient::CheckP
telemetry_service->AddSignal(std::move(password_reuse_signal));
#endif // !BUILDFLAG(IS_ANDROID)
}
@@ -1363,7 +1349,7 @@
}
#if !BUILDFLAG(IS_ANDROID)
@@ -1049,36 +1045,10 @@ void ChromePasswordManagerClient::MaybeR
@@ -992,36 +988,10 @@ void ChromePasswordManagerClient::MaybeR
bool is_federated,
const url::Origin& federated_origin,
const std::u16string& login_user_name) const {
@@ -1400,7 +1386,7 @@
}
#endif
@@ -1596,7 +1566,9 @@ void ChromePasswordManagerClient::OnPast
@@ -1527,7 +1497,9 @@ void ChromePasswordManagerClient::OnPast
}
was_on_paste_called_ = true;
@@ -1410,7 +1396,7 @@
}
void ChromePasswordManagerClient::RenderFrameCreated(
@@ -1632,7 +1604,9 @@ void ChromePasswordManagerClient::OnInpu
@@ -1563,7 +1535,9 @@ void ChromePasswordManagerClient::OnInpu
if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
OnPaste();
} else {
@@ -1420,7 +1406,7 @@
}
#endif // BUILDFLAG(IS_ANDROID)
}
@@ -1671,6 +1645,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1602,6 +1576,7 @@ bool ChromePasswordManagerClient::IsPass
is_enabled = false;
}
@@ -1428,7 +1414,7 @@
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Disable password
@@ -1681,6 +1656,7 @@ bool ChromePasswordManagerClient::IsPass
@@ -1612,6 +1587,7 @@ bool ChromePasswordManagerClient::IsPass
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -1438,7 +1424,7 @@
password_manager::BrowserSavePasswordProgressLogger logger(
--- a/chrome/browser/password_manager/chrome_password_manager_client.h
+++ b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -233,13 +233,14 @@ class ChromePasswordManagerClient
@@ -228,13 +228,14 @@ class ChromePasswordManagerClient
void AnnotateNavigationEntry(bool has_password_field) override;
autofill::LanguageCode GetPageLanguage() const override;
@@ -1454,7 +1440,7 @@
void CheckProtectedPasswordEntry(
password_manager::metrics_util::PasswordType reused_password_type,
@@ -249,6 +250,7 @@ class ChromePasswordManagerClient
@@ -244,6 +245,7 @@ class ChromePasswordManagerClient
bool password_field_exists,
uint64_t reused_password_hash,
const std::string& domain) override;
@@ -1514,7 +1500,7 @@
void ContextualNotificationPermissionUiSelector::OnSafeBrowsingVerdictReceived(
--- a/chrome/browser/permissions/permission_revocation_request.cc
+++ b/chrome/browser/permissions/permission_revocation_request.cc
@@ -136,27 +136,7 @@ void PermissionRevocationRequest::CheckA
@@ -134,27 +134,7 @@ void PermissionRevocationRequest::CheckA
DCHECK(profile_);
DCHECK(callback_);
@@ -1542,7 +1528,7 @@
}
void PermissionRevocationRequest::OnSiteReputationReady(
@@ -166,33 +146,6 @@ void PermissionRevocationRequest::OnSite
@@ -164,33 +144,6 @@ void PermissionRevocationRequest::OnSite
base::TimeTicks::Now() - crowd_deny_request_start_time_.value();
}
@@ -1641,7 +1627,7 @@
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
#include "components/safe_browsing/core/common/safe_browsing_policy_handler.h"
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -1856,8 +1857,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -1888,8 +1889,6 @@ std::unique_ptr<ConfigurationPolicyHandl
handlers->AddHandler(
std::make_unique<bookmarks::ManagedBookmarksPolicyHandler>(
chrome_schema));
@@ -1650,7 +1636,7 @@
handlers->AddHandler(std::make_unique<syncer::SyncPolicyHandler>());
handlers->AddHandler(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
@@ -1915,13 +1914,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -1947,13 +1946,6 @@ std::unique_ptr<ConfigurationPolicyHandl
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
@@ -1666,7 +1652,7 @@
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -260,7 +260,6 @@
@@ -264,7 +264,6 @@
#include "chrome/browser/new_tab_page/modules/drive/drive_service.h"
#include "chrome/browser/new_tab_page/modules/photos/photos_service.h"
#include "chrome/browser/new_tab_page/modules/recipes/recipes_service.h"
@@ -1674,7 +1660,7 @@
#include "chrome/browser/new_tab_page/promos/promo_service.h"
#include "chrome/browser/policy/developer_tools_policy_handler.h"
#include "chrome/browser/search/background/ntp_custom_background_service.h"
@@ -1455,7 +1454,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -1495,7 +1494,6 @@ void RegisterProfilePrefs(user_prefs::Pr
NewTabPageHandler::RegisterProfilePrefs(registry);
NewTabPageUI::RegisterProfilePrefs(registry);
NewTabUI::RegisterProfilePrefs(registry);
@@ -1684,7 +1670,7 @@
PinnedTabCodec::RegisterProfilePrefs(registry);
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -598,7 +598,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -594,7 +594,6 @@ void ChromeBrowserMainExtraPartsProfiles
}
#endif
TabRestoreServiceFactory::GetInstance();
@@ -1694,7 +1680,7 @@
#if !BUILDFLAG(IS_ANDROID)
--- a/chrome/browser/reputation/reputation_service.cc
+++ b/chrome/browser/reputation/reputation_service.cc
@@ -116,9 +116,7 @@ void ReputationService::GetReputationSta
@@ -113,9 +113,7 @@ void ReputationService::GetReputationSta
ReputationCheckCallback callback) {
DCHECK(url.SchemeIsHTTPOrHTTPS());
@@ -1870,7 +1856,7 @@
} // namespace
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -556,7 +556,6 @@ static_library("ui") {
@@ -554,7 +554,6 @@ static_library("ui") {
"//components/renderer_context_menu",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -1878,7 +1864,7 @@
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser/db:database_manager",
@@ -3462,8 +3461,6 @@ static_library("ui") {
@@ -3467,8 +3466,6 @@ static_library("ui") {
"startup/web_app_startup_utils.h",
"tab_contents/chrome_web_contents_menu_helper.cc",
"tab_contents/chrome_web_contents_menu_helper.h",
@@ -1887,7 +1873,7 @@
"views/autofill/payments/virtual_card_selection_dialog_view_impl.cc",
"views/autofill/payments/virtual_card_selection_dialog_view_impl.h",
"views/autofill/payments/webauthn_dialog_view_impl.cc",
@@ -4917,8 +4914,6 @@ static_library("ui") {
@@ -4914,8 +4911,6 @@ static_library("ui") {
"views/safe_browsing/prompt_for_scanning_modal_dialog.h",
"views/safe_browsing/tailored_security_desktop_dialog_manager.cc",
"views/safe_browsing/tailored_security_desktop_dialog_manager.h",
@@ -1924,7 +1910,7 @@
void JavaScriptTabModalDialogManagerDelegateDesktop::DidCloseDialog() {
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -822,9 +822,7 @@ void DownloadItemView::UpdateLabels() {
@@ -815,9 +815,7 @@ void DownloadItemView::UpdateLabels() {
deep_scanning_label_->SetVisible(mode_ ==
download::DownloadItemMode::kDeepScanning);
if (deep_scanning_label_->GetVisible()) {
@@ -1935,7 +1921,7 @@
? IDS_PROMPT_DEEP_SCANNING_DOWNLOAD
: IDS_PROMPT_DEEP_SCANNING_APP_DOWNLOAD;
const std::u16string filename = ElidedFilename(*deep_scanning_label_);
@@ -850,11 +848,15 @@ void DownloadItemView::UpdateButtons() {
@@ -843,11 +841,15 @@ void DownloadItemView::UpdateButtons() {
}
const bool allow_open_during_deep_scan =
@@ -1951,7 +1937,7 @@
open_button_->SetEnabled((mode_ == download::DownloadItemMode::kNormal) ||
prompt_to_scan || allow_open_during_deep_scan);
@@ -1337,7 +1339,9 @@ void DownloadItemView::ShowContextMenuIm
@@ -1279,7 +1281,9 @@ void DownloadItemView::ShowContextMenuIm
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -1985,12 +1971,17 @@
std::unique_ptr<RenderViewContextMenuBase>
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -178,32 +178,6 @@ void DownloadsDOMHandler::SaveDangerousR
@@ -179,37 +179,6 @@ void DownloadsDOMHandler::SaveDangerousR
void DownloadsDOMHandler::DiscardDangerous(const std::string& id) {
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_DISCARD_DANGEROUS);
- download::DownloadItem* download = GetDownloadByStringId(id);
- if (download) {
- // The warning action event needs to be added before Safe Browsing report is
- // sent, because this event should be included in the report.
- DownloadItemWarningData::AddWarningActionEvent(
- download, DownloadItemWarningData::WarningSurface::DOWNLOADS_PAGE,
- DownloadItemWarningData::WarningAction::DISCARD);
- // If this download is no longer dangerous, is already canceled or
- // completed, don't send any report.
- // Only sends dangerous download discard report if :
@@ -2018,7 +2009,7 @@
RemoveDownloadInArgs(id);
}
@@ -404,12 +378,6 @@ void DownloadsDOMHandler::ReviewDangerou
@@ -410,12 +379,6 @@ void DownloadsDOMHandler::ReviewDangerou
return;
}
@@ -2033,7 +2024,7 @@
// DownloadsDOMHandler, private: --------------------------------------------
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -928,12 +928,6 @@ base::Value::Dict ManagementUIHandler::G
@@ -954,12 +954,6 @@ base::Value::Dict ManagementUIHandler::G
&info);
}
@@ -2058,7 +2049,7 @@
#include "components/safe_browsing/core/browser/db/database_manager.h"
#include "content/public/browser/web_contents.h"
#include "mojo/public/cpp/bindings/self_owned_receiver.h"
@@ -200,11 +202,13 @@ void ShareServiceImpl::Share(const std::
@@ -208,11 +210,13 @@ void ShareServiceImpl::Share(const std::
// Check if at least one file is marked by the download protection service
// to send a ping to check this file type.
@@ -2072,7 +2063,7 @@
// In the case where the original blob handle was to a native file (of
// unknown size), the serialized data does not contain an accurate file
@@ -214,6 +218,7 @@ void ShareServiceImpl::Share(const std::
@@ -222,6 +226,7 @@ void ShareServiceImpl::Share(const std::
}
DCHECK(!safe_browsing_request_);
@@ -2080,7 +2071,7 @@
if (should_check_url && g_browser_process->safe_browsing_service()) {
safe_browsing_request_.emplace(
g_browser_process->safe_browsing_service()->database_manager(),
@@ -223,6 +228,7 @@ void ShareServiceImpl::Share(const std::
@@ -231,6 +236,7 @@ void ShareServiceImpl::Share(const std::
std::move(files), std::move(callback)));
return;
}
@@ -2090,7 +2081,7 @@
std::move(callback),
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1429,7 +1429,6 @@ if (!is_android) {
@@ -1435,7 +1435,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2098,7 +2089,7 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -5990,7 +5989,6 @@ test("unit_tests") {
@@ -6041,7 +6040,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2108,7 +2099,7 @@
"//components/safe_browsing/content/browser/web_ui",
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -430,7 +430,7 @@ void ContentPasswordManagerDriver::Check
@@ -435,7 +435,7 @@ void ContentPasswordManagerDriver::Check
if (!password_manager::bad_message::CheckFrameNotPrerendering(
render_frame_host_))
return;
@@ -2119,7 +2110,7 @@
}
--- a/components/password_manager/core/browser/password_manager_client.h
+++ b/components/password_manager/core/browser/password_manager_client.h
@@ -394,11 +394,14 @@ class PasswordManagerClient {
@@ -390,11 +390,14 @@ class PasswordManagerClient {
// Returns the current best guess as to the page's display language.
virtual autofill::LanguageCode GetPageLanguage() const;
@@ -2135,7 +2126,7 @@
// Checks the safe browsing reputation of the webpage when the
// user focuses on a username/password field. This is used for reporting
// only, and won't trigger a warning.
@@ -406,6 +409,7 @@ class PasswordManagerClient {
@@ -402,6 +405,7 @@ class PasswordManagerClient {
const GURL& frame_url) = 0;
#endif
@@ -2143,7 +2134,7 @@
// Checks the safe browsing reputation of the webpage where password reuse
// happens. This is called by the PasswordReuseDetectionManager when a
// protected password is typed on the wrong domain. This may trigger a
@@ -422,6 +426,7 @@ class PasswordManagerClient {
@@ -418,6 +422,7 @@ class PasswordManagerClient {
bool password_field_exists,
uint64_t reused_password_hash,
const std::string& domain) = 0;
@@ -2165,6 +2156,16 @@
}
void PasswordReuseDetectionManager::SetClockForTesting(base::Clock* clock) {
--- a/components/resources/safe_browsing_resources.grdp
+++ b/components/resources/safe_browsing_resources.grdp
@@ -3,7 +3,6 @@
<include name="IDR_SAFE_BROWSING_HTML" file="..\..\components\safe_browsing\content\browser\web_ui\resources\safe_browsing.html" preprocess="true" type="BINDATA" />
<include name="IDR_SAFE_BROWSING_CSS" file="..\..\components\safe_browsing\content\browser\web_ui\resources\safe_browsing.css" type="BINDATA" />
<include name="IDR_SAFE_BROWSING_JS" file="..\..\components\safe_browsing\content\browser\web_ui\resources\safe_browsing.js" preprocess="true" type="BINDATA" />
- <include name="IDR_REAL_TIME_URL_CHECKS_ALLOWLIST_PB" file="..\..\components\safe_browsing\content\resources\real_time_url_checks_allowlist.pb" type="BINDATA" compress="gzip" />
<if expr="safe_browsing_mode != 0">
<include name="IDR_DOWNLOAD_FILE_TYPES_PB" file="${root_gen_dir}\components\safe_browsing\content\resources\download_file_types.pb" use_base_dir="false" type="BINDATA" compress="gzip" />
</if>
--- a/components/safe_browsing/content/common/proto/BUILD.gn
+++ b/components/safe_browsing/content/common/proto/BUILD.gn
@@ -5,8 +5,12 @@
@@ -2224,11 +2225,11 @@
if (sync_observer_) {
--- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
@@ -166,15 +166,8 @@ void FileSystemAccessSafeMoveHelper::Sta
@@ -168,15 +168,8 @@ void FileSystemAccessSafeMoveHelper::Sta
return;
}
- if (!RequireSecurityChecks() || !manager_->permission_context()) {
- if (!RequireAfterWriteChecks() || !manager_->permission_context()) {
DidAfterWriteCheck(
FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow);
- return;
@@ -2240,8 +2241,8 @@
}
void FileSystemAccessSafeMoveHelper::ComputeHashForSourceFile(
@@ -195,45 +188,6 @@ void FileSystemAccessSafeMoveHelper::Com
std::move(wrapped_callback), source_url()));
@@ -227,45 +220,6 @@ bool FileSystemAccessSafeMoveHelper::Req
return dest_url().type() != storage::kFileSystemTypeTemporary;
}
-void FileSystemAccessSafeMoveHelper::DoAfterWriteCheck(
@@ -2288,7 +2289,7 @@
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--- a/content/browser/file_system_access/file_system_access_safe_move_helper.h
+++ b/content/browser/file_system_access/file_system_access_safe_move_helper.h
@@ -55,9 +55,6 @@ class CONTENT_EXPORT FileSystemAccessSaf
@@ -60,9 +60,6 @@ class CONTENT_EXPORT FileSystemAccessSaf
private:
SEQUENCE_CHECKER(sequence_checker_);
@@ -2300,7 +2301,7 @@
void DidFileSkipQuarantine(base::File::Error result);
--- a/content/public/browser/file_system_access_permission_context.h
+++ b/content/public/browser/file_system_access_permission_context.h
@@ -112,12 +112,6 @@ class FileSystemAccessPermissionContext
@@ -116,12 +116,6 @@ class FileSystemAccessPermissionContext
base::OnceCallback<void(SensitiveEntryResult)> callback) = 0;
enum class AfterWriteCheckResult { kAllow, kBlock };
@@ -2342,7 +2343,7 @@
declare_args() {
--- a/weblayer/BUILD.gn
+++ b/weblayer/BUILD.gn
@@ -473,7 +473,6 @@ source_set("weblayer_lib_base") {
@@ -470,7 +470,6 @@ source_set("weblayer_lib_base") {
"//components/profile_metrics",
"//components/reduce_accept_language/browser",
"//components/safe_browsing/content/browser",

2
patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch
View File

@@ -5,7 +5,7 @@
@@ -127,7 +127,7 @@ bool CheckDuplicateEntries(const Transpo
bool CheckNoopEntries(const TransportSecurityStateEntries& entries) {
for (const auto& entry : entries) {
if (!entry->force_https && entry->pinset.empty() && !entry->expect_ct) {
if (!entry->force_https && entry->pinset.empty()) {
- if (entry->hostname == "learn.doubleclick.net") {
+ if (entry->hostname == "learn.double" "click." "net") {
// This entry is deliberately used as an exclusion.

290
patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
View File

@@ -12,7 +12,7 @@
#include "components/url_formatter/url_fixer.h"
#include "components/user_prefs/user_prefs.h"
#include "components/visitedlink/browser/visitedlink_writer.h"
@@ -527,8 +526,6 @@ void AwBrowserContext::RebuildTable(
@@ -526,8 +525,6 @@ void AwBrowserContext::RebuildTable(
}
void AwBrowserContext::SetExtendedReportingAllowed(bool allowed) {
@@ -23,7 +23,7 @@
// TODO(amalova): Make sure NetworkContextParams is configured correctly when
--- a/chrome/app/settings_strings.grdp
+++ b/chrome/app/settings_strings.grdp
@@ -2156,69 +2156,9 @@
@@ -2352,69 +2352,9 @@
<message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_DESC_COOKIES_PAGE" desc="On the cookies page, the secondary text next to the checkbox that enables prediction of network actions.">
Preloads pages that Chrome thinks you might visit. To do this, Chrome may use cookies, if you allow cookies, and may encrypt and send pages through Google to hide your identity from sites.
</message>
@@ -157,8 +157,8 @@
namespace lock_screen_apps {
--- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
+++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl_unittest.cc
@@ -38,7 +38,6 @@
#include "chromeos/ash/components/dbus/concierge/concierge_client.h"
@@ -53,7 +53,6 @@
#include "components/account_id/account_id.h"
#include "components/crx_file/id_util.h"
#include "components/prefs/pref_service.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
@@ -167,15 +167,15 @@
#include "content/public/test/browser_task_environment.h"
--- a/chrome/browser/ash/login/signin/device_id_browsertest.cc
+++ b/chrome/browser/ash/login/signin/device_id_browsertest.cc
@@ -25,7 +25,6 @@
#include "chrome/common/chrome_switches.h"
@@ -27,7 +27,6 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chromeos/dbus/constants/dbus_paths.h"
#include "components/prefs/pref_service.h"
-#include "components/signin/public/base/signin_pref_names.h"
#include "components/user_manager/known_user.h"
#include "components/user_manager/user_manager.h"
#include "content/public/test/browser_test.h"
@@ -255,15 +254,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
@@ -271,15 +270,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
@@ -191,7 +191,7 @@
// Can't use SetKnownUserDeviceId here, because it forbids changing a device
// ID.
user_manager::KnownUser known_user(g_browser_process->local_state());
@@ -289,13 +279,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
@@ -305,13 +295,6 @@ IN_PROC_BROWSER_TEST_F(DeviceIDTest, PRE
SignInOnline(FakeGaiaMixin::kFakeUserEmail, FakeGaiaMixin::kFakeUserPassword,
kRefreshToken1, FakeGaiaMixin::kFakeUserGaiaId);
@@ -207,7 +207,7 @@
user_manager::KnownUser known_user(g_browser_process->local_state());
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -246,7 +246,6 @@
@@ -248,7 +248,6 @@
#include "components/safe_browsing/core/browser/realtime/url_lookup_service.h"
#include "components/safe_browsing/core/browser/url_checker_delegate.h"
#include "components/safe_browsing/core/common/features.h"
@@ -227,7 +227,7 @@
#include "content/public/browser/browser_task_traits.h"
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -901,6 +901,7 @@ void DownloadItemModel::ExecuteCommand(D
@@ -924,6 +924,7 @@ void DownloadItemModel::ExecuteCommand(D
DownloadUIModel::ExecuteCommand(download_commands, command);
break;
case DownloadCommands::DEEP_SCAN:
@@ -235,7 +235,7 @@
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -933,6 +934,7 @@ void DownloadItemModel::ExecuteCommand(D
@@ -956,6 +957,7 @@ void DownloadItemModel::ExecuteCommand(D
safe_browsing::DeepScanningRequest::DeepScanTrigger::
TRIGGER_APP_PROMPT,
safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
@@ -263,7 +263,7 @@
#include "components/signin/public/base/consent_level.h"
#include "components/signin/public/identity_manager/identity_manager.h"
#include "components/user_prefs/user_prefs.h"
@@ -376,8 +375,7 @@ std::string ConnectorsService::GetManage
@@ -340,8 +339,7 @@ std::string ConnectorsService::GetManage
absl::optional<policy::PolicyScope> scope = absl::nullopt;
for (const char* scope_pref :
@@ -273,7 +273,7 @@
ConnectorScopePref(AnalysisConnector::FILE_DOWNLOADED),
ConnectorScopePref(AnalysisConnector::BULK_DATA_ENTRY),
ConnectorScopePref(AnalysisConnector::PRINT),
@@ -429,20 +427,6 @@ std::string ConnectorsService::GetManage
@@ -393,20 +391,6 @@ std::string ConnectorsService::GetManage
absl::optional<std::string> ConnectorsService::GetDMTokenForRealTimeUrlCheck()
const {
@@ -296,7 +296,7 @@
--- a/chrome/browser/enterprise/connectors/connectors_service.h
+++ b/chrome/browser/enterprise/connectors/connectors_service.h
@@ -15,7 +15,6 @@
@@ -16,7 +16,6 @@
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
#include "components/keyed_service/core/keyed_service.h"
#include "components/policy/core/common/policy_types.h"
@@ -491,7 +491,7 @@
did_just_control_pref) {
--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -31,7 +31,6 @@
@@ -30,7 +30,6 @@
#include "components/keep_alive_registry/scoped_keep_alive.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
#include "components/prefs/pref_service.h"
@@ -499,7 +499,7 @@
#include "components/translate/core/browser/translate_pref_names.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/browser_test.h"
@@ -86,7 +85,6 @@ class ExtensionPreferenceApiTest
@@ -85,7 +84,6 @@ class ExtensionPreferenceApiTest
prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions));
EXPECT_TRUE(
prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
@@ -507,7 +507,7 @@
EXPECT_TRUE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
}
@@ -112,7 +110,6 @@ class ExtensionPreferenceApiTest
@@ -111,7 +109,6 @@ class ExtensionPreferenceApiTest
prefs->GetInteger(prefetch::prefs::kNetworkPredictionOptions));
EXPECT_FALSE(
prefs->GetBoolean(password_manager::prefs::kCredentialsEnableService));
@@ -515,7 +515,7 @@
EXPECT_FALSE(prefs->GetBoolean(prefs::kSearchSuggestEnabled));
}
@@ -185,7 +182,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen
@@ -184,7 +181,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionPreferen
prefetch::prefs::kNetworkPredictionOptions,
static_cast<int>(prefetch::NetworkPredictionOptions::kDisabled));
prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false);
@@ -545,7 +545,7 @@
#include "extensions/browser/test_event_router.h"
--- a/chrome/browser/extensions/api/settings_private/prefs_util.cc
+++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc
@@ -45,7 +45,6 @@
@@ -44,7 +44,6 @@
#include "components/prefs/pref_service.h"
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
#include "components/proxy_config/proxy_config_pref_names.h"
@@ -553,7 +553,7 @@
#include "components/search_engines/default_search_manager.h"
#include "components/spellcheck/browser/pref_names.h"
#include "components/translate/core/browser/translate_pref_names.h"
@@ -303,16 +302,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
@@ -310,16 +309,6 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
settings_api::PrefType::PREF_TYPE_BOOLEAN;
// Security page
@@ -637,15 +637,15 @@
} // namespace extensions
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -28,7 +28,6 @@
@@ -27,7 +27,6 @@
#include "chrome/common/extensions/chrome_manifest_url_handlers.h"
#include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
#include "chrome/common/webui_url_constants.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "content/public/common/url_constants.h"
@@ -800,12 +799,6 @@ void InstalledLoader::RecordExtensionsMe
#include "extensions/browser/allowlist_state.h"
@@ -766,12 +765,6 @@ void InstalledLoader::RecordExtensionsMe
enabled_not_allowlisted_count);
base::UmaHistogramCounts100("Extensions.NotAllowlistedDisabled",
disabled_not_allowlisted_count);
@@ -690,9 +690,9 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/first_party_sets_handler.h"
@@ -873,15 +872,8 @@ void ProfileNetworkContextService::Confi
@@ -872,15 +871,8 @@ void ProfileNetworkContextService::Confi
network_context_params->enable_certificate_reporting = true;
network_context_params->enable_expect_ct_reporting = true;
- SCTReportingService* sct_reporting_service =
- SCTReportingServiceFactory::GetForBrowserContext(profile_);
@@ -739,7 +739,7 @@
}
TrialComparisonCertVerifierController::
@@ -94,9 +87,7 @@ bool TrialComparisonCertVerifierControll
@@ -95,9 +88,7 @@ bool TrialComparisonCertVerifierControll
if (!MaybeAllowedForProfile(profile_))
return false;
@@ -895,7 +895,7 @@
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/sync/base/pref_names.h"
#include "components/sync/driver/sync_policy_handler.h"
@@ -224,9 +221,6 @@ const PolicyToPreferenceMapEntry kSimple
@@ -229,9 +226,6 @@ const PolicyToPreferenceMapEntry kSimple
{ key::kDefaultPopupsSetting,
prefs::kManagedDefaultPopupsSetting,
base::Value::Type::INTEGER },
@@ -905,7 +905,7 @@
{ key::kEditBookmarksEnabled,
bookmarks::prefs::kEditBookmarksEnabled,
base::Value::Type::BOOLEAN },
@@ -246,9 +240,6 @@ const PolicyToPreferenceMapEntry kSimple
@@ -251,9 +245,6 @@ const PolicyToPreferenceMapEntry kSimple
prefs::kPrintingEnabled,
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(ENABLE_PRINTING)
@@ -915,7 +915,7 @@
{ key::kSavingBrowserHistoryDisabled,
prefs::kSavingBrowserHistoryDisabled,
base::Value::Type::BOOLEAN },
@@ -313,9 +304,6 @@ const PolicyToPreferenceMapEntry kSimple
@@ -324,9 +315,6 @@ const PolicyToPreferenceMapEntry kSimple
{ key::kAdsSettingForIntrusiveAdsSites,
prefs::kManagedDefaultAdsSetting,
base::Value::Type::INTEGER },
@@ -925,7 +925,7 @@
{ key::kAllowCrossOriginAuthPrompt,
prefs::kAllowCrossOriginAuthPrompt,
base::Value::Type::BOOLEAN },
@@ -512,15 +500,6 @@ const PolicyToPreferenceMapEntry kSimple
@@ -523,15 +511,6 @@ const PolicyToPreferenceMapEntry kSimple
{ key::kPasswordDismissCompromisedAlertEnabled,
password_manager::prefs::kPasswordDismissCompromisedAlertEnabled,
base::Value::Type::BOOLEAN },
@@ -938,10 +938,10 @@
- { key::kPasswordProtectionWarningTrigger,
- prefs::kPasswordProtectionWarningTrigger,
- base::Value::Type::INTEGER },
{ key::kPolicyRefreshRate,
policy_prefs::kUserPolicyRefreshRate,
base::Value::Type::INTEGER },
@@ -559,9 +538,6 @@ const PolicyToPreferenceMapEntry kSimple
#if BUILDFLAG(ENABLE_PDF)
{ key::kPdfLocalFileAccessAllowedForDomains,
prefs::kPdfLocalFileAccessAllowedForDomains,
@@ -575,9 +554,6 @@ const PolicyToPreferenceMapEntry kSimple
{ key::kRestoreOnStartupURLs,
prefs::kURLsToRestoreOnStartup,
base::Value::Type::LIST },
@@ -951,7 +951,7 @@
{ key::kSafeSitesFilterBehavior,
policy_prefs::kSafeSitesFilterBehavior,
base::Value::Type::INTEGER },
@@ -679,9 +655,6 @@ const PolicyToPreferenceMapEntry kSimple
@@ -698,9 +674,6 @@ const PolicyToPreferenceMapEntry kSimple
{ key::kAdditionalDnsQueryTypesEnabled,
prefs::kAdditionalDnsQueryTypesEnabled,
base::Value::Type::BOOLEAN },
@@ -961,17 +961,17 @@
{ key::kForceGoogleSafeSearch,
prefs::kForceGoogleSafeSearch,
base::Value::Type::BOOLEAN },
@@ -1501,9 +1474,6 @@ const PolicyToPreferenceMapEntry kSimple
{ key::kIdleProfileCloseTimeout,
prefs::kIdleProfileCloseTimeout,
base::Value::Type::INTEGER },
@@ -1520,9 +1493,6 @@ const PolicyToPreferenceMapEntry kSimple
prefs::kImportDialogAutofillFormData,
base::Value::Type::BOOLEAN },
- { key::kRestrictSigninToPattern,
- prefs::kGoogleServicesUsernamePattern,
- base::Value::Type::STRING },
{ key::kHardwareAccelerationModeEnabled,
prefs::kHardwareAccelerationModeEnabled,
base::Value::Type::BOOLEAN },
@@ -1907,12 +1877,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -1939,12 +1909,6 @@ std::unique_ptr<ConfigurationPolicyHandl
SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED));
@@ -984,7 +984,7 @@
handlers->AddHandler(
std::make_unique<ManagedAccountRestrictionsPolicyHandler>(chrome_schema));
@@ -2088,24 +2052,6 @@ std::unique_ptr<ConfigurationPolicyHandl
@@ -2128,24 +2092,6 @@ std::unique_ptr<ConfigurationPolicyHandl
#else // BUILDFLAG(IS_CHROMEOS)
std::vector<std::unique_ptr<ConfigurationPolicyHandler>>
signin_legacy_policies;
@@ -1012,8 +1012,8 @@
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -136,7 +136,6 @@
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
#include "components/reading_list/core/reading_list_pref_names.h"
#include "components/safe_browsing/content/common/file_type_policies_prefs.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
#include "components/search_engines/template_url_prepopulate_data.h"
@@ -1027,7 +1027,7 @@
#include "components/signin/public/identity_manager/identity_manager.h"
#include "components/site_engagement/content/site_engagement_service.h"
#include "components/subresource_filter/content/browser/ruleset_service.h"
@@ -1078,7 +1076,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1111,7 +1109,6 @@ void RegisterLocalState(PrefRegistrySimp
PushMessagingServiceImpl::RegisterPrefs(registry);
#endif
RegisterScreenshotPrefs(registry);
@@ -1035,7 +1035,7 @@
secure_origin_allowlist::RegisterPrefs(registry);
segmentation_platform::SegmentationPlatformService::RegisterLocalStatePrefs(
registry);
@@ -1341,8 +1338,6 @@ void RegisterProfilePrefs(user_prefs::Pr
@@ -1377,8 +1374,6 @@ void RegisterProfilePrefs(user_prefs::Pr
PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
RegisterBrowserUserPrefs(registry);
@@ -1044,7 +1044,7 @@
SearchPrefetchService::RegisterProfilePrefs(registry);
blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs(
registry);
@@ -2030,17 +2025,6 @@ void MigrateObsoleteProfilePrefs(Profile
@@ -2065,17 +2060,6 @@ void MigrateObsoleteProfilePrefs(Profile
#endif // BUILDFLAG(IS_ANDROID)
profile_prefs->ClearPref(origin_trials::kOriginTrialPrefKey);
@@ -1072,7 +1072,7 @@
#include "components/safe_browsing/core/common/safebrowsing_switches.h"
#include "components/sync/base/pref_names.h"
#include "content/public/common/content_switches.h"
@@ -80,8 +79,6 @@ const CommandLinePrefStore::BooleanSwitc
@@ -76,8 +75,6 @@ const CommandLinePrefStore::BooleanSwitc
{switches::kAllowCrossOriginAuthPrompt,
prefs::kAllowCrossOriginAuthPrompt, true},
{switches::kDisablePrintPreview, prefs::kPrintPreviewDisabled, true},
@@ -1204,7 +1204,7 @@
void ProfileAttributesEntry::LockForceSigninProfile(bool is_lock) {
--- a/chrome/browser/profiles/profile_attributes_storage.cc
+++ b/chrome/browser/profiles/profile_attributes_storage.cc
@@ -39,7 +39,6 @@
@@ -38,7 +38,6 @@
#include "components/prefs/scoped_user_pref_update.h"
#include "components/profile_metrics/state.h"
#include "components/signin/public/base/persistent_repeating_timer.h"
@@ -1212,7 +1212,7 @@
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "third_party/icu/source/i18n/unicode/coll.h"
@@ -375,8 +374,6 @@ void ProfileAttributesStorage::AddProfil
@@ -374,8 +373,6 @@ void ProfileAttributesStorage::AddProfil
if (params.account_id.HasAccountIdKey())
info.SetStringKey(ProfileAttributesEntry::kAccountIdKey,
params.account_id.GetAccountIdKey());
@@ -1223,7 +1223,7 @@
ProfileAttributesEntry* entry = InitEntryWithKey(key, params.is_omitted);
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -145,7 +145,6 @@
@@ -146,7 +146,6 @@
#include "components/prefs/scoped_user_pref_update.h"
#include "components/profile_metrics/browser_profile_type.h"
#include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
@@ -1233,7 +1233,7 @@
#include "components/spellcheck/spellcheck_buildflags.h"
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -94,7 +94,6 @@
@@ -83,7 +83,6 @@
#include "components/signin/public/base/consent_level.h"
#include "components/signin/public/base/signin_buildflags.h"
#include "components/signin/public/base/signin_metrics.h"
@@ -1241,7 +1241,7 @@
#include "components/signin/public/identity_manager/identity_manager.h"
#include "components/signin/public/identity_manager/primary_account_mutator.h"
#include "components/sync/base/stop_source.h"
@@ -2289,8 +2288,7 @@ void ProfileManager::AddProfileToStorage
@@ -1861,8 +1860,7 @@ void ProfileManager::AddProfileToStorage
entry->SetAuthInfo(account_info.gaia, username,
is_consented_primary_account);
@@ -1251,7 +1251,7 @@
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
// Sign out if force-sign-in policy is enabled and profile is not signed
@@ -2339,14 +2337,13 @@ void ProfileManager::AddProfileToStorage
@@ -1911,14 +1909,13 @@ void ProfileManager::AddProfileToStorage
init_params.is_ephemeral = IsForceEphemeralProfilesEnabled(profile);
init_params.is_signed_in_with_credential_provider =
@@ -1269,7 +1269,7 @@
prefs->ClearPref(DefaultSearchManager::kDefaultSearchProviderDataPrefName);
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -39,7 +39,6 @@
@@ -38,7 +38,6 @@
#include "chrome/common/url_constants.h"
#include "components/flags_ui/pref_service_flags_storage.h"
#include "components/prefs/pref_service.h"
@@ -1304,7 +1304,7 @@
</cr-dialog>
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -576,7 +576,7 @@
@@ -647,7 +647,7 @@
</category-setting-exceptions>
</settings-subpage>
</template>
@@ -1443,7 +1443,7 @@
- </template>
--- a/chrome/browser/resources/settings/privacy_page/security_page.ts
+++ b/chrome/browser/resources/settings/privacy_page/security_page.ts
@@ -219,20 +219,6 @@ export class SettingsSecurityPageElement
@@ -219,21 +219,6 @@ export class SettingsSecurityPageElement
override ready() {
super.ready();
@@ -1459,12 +1459,13 @@
- }
- });
-
- this.registerHelpBubbleIdentifier(
- 'kEnhancedProtectionSettingElementId', 'safeBrowsingEnhanced');
- this.registerHelpBubble(
- 'kEnhancedProtectionSettingElementId',
- this.$.safeBrowsingEnhanced.getBubbleAnchor());
}
/**
@@ -281,8 +267,7 @@ export class SettingsSecurityPageElement
@@ -283,8 +268,7 @@ export class SettingsSecurityPageElement
}
private getDisabledExtendedSafeBrowsing_(): boolean {
@@ -1476,7 +1477,7 @@
private getPasswordsLeakToggleSubLabel_(): string {
--- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
+++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.ts
@@ -47,7 +47,7 @@ function getCategoryItemMap(): Map<Conte
@@ -50,7 +50,7 @@ function getCategoryItemMap(): Map<Conte
enabledLabel: 'siteSettingsAdsAllowed',
disabledLabel: 'siteSettingsAdsBlocked',
shouldShow: () =>
@@ -1506,7 +1507,7 @@
if (is_under_advanced_protection_)
ScheduleNextRefresh();
} else {
@@ -231,20 +228,10 @@ void AdvancedProtectionStatusManager::Ca
@@ -221,20 +218,10 @@ void AdvancedProtectionStatusManager::Ca
void AdvancedProtectionStatusManager::UpdateLastRefreshTime() {
last_refreshed_ = base::Time::Now();
@@ -1920,7 +1921,7 @@
#include "content/public/test/test_utils.h"
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -40,7 +40,6 @@
@@ -39,7 +39,6 @@
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/common/features.h"
#include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1940,7 +1941,7 @@
#include "extensions/browser/quota_service.h"
--- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
@@ -43,7 +43,6 @@
@@ -42,7 +42,6 @@
#include "components/history/core/browser/history_database_params.h"
#include "components/history/core/browser/history_service.h"
#include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -1990,7 +1991,7 @@
#include "components/security_interstitials/content/security_interstitial_tab_helper.h"
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -125,7 +125,6 @@ base::FilePath SafeBrowsingService::GetB
@@ -142,7 +142,6 @@ base::FilePath SafeBrowsingService::GetB
SafeBrowsingService::SafeBrowsingService()
: services_delegate_(ServicesDelegate::Create(this)),
@@ -1998,7 +1999,7 @@
shutdown_(false),
enabled_(false),
enabled_by_prefs_(false) {}
@@ -253,8 +252,6 @@ TriggerManager* SafeBrowsingService::tri
@@ -270,8 +269,6 @@ TriggerManager* SafeBrowsingService::tri
PasswordProtectionService* SafeBrowsingService::GetPasswordProtectionService(
Profile* profile) const {
@@ -2007,7 +2008,7 @@
return nullptr;
}
@@ -346,9 +343,6 @@ void SafeBrowsingService::OnProfileAdded
@@ -368,9 +365,6 @@ void SafeBrowsingService::OnProfileAdded
std::unique_ptr<PrefChangeRegistrar> registrar =
std::make_unique<PrefChangeRegistrar>();
registrar->Init(pref_service);
@@ -2017,7 +2018,7 @@
// ClientSideDetectionService will need to be refresh the models
// renderers have if extended-reporting changes.
registrar->Add(prefs::kSafeBrowsingScoutReportingEnabled,
@@ -377,14 +371,6 @@ void SafeBrowsingService::OnProfileAdded
@@ -399,14 +393,6 @@ void SafeBrowsingService::OnProfileAdded
NoCachedPopulationReason::kChangeMbbPref));
user_population_prefs_[pref_service] = std::move(registrar);
@@ -2032,7 +2033,7 @@
// Extended Reporting metrics are handled together elsewhere.
RecordExtendedReportingMetrics(*pref_service);
@@ -427,18 +413,6 @@ void SafeBrowsingService::RefreshState()
@@ -449,18 +435,6 @@ void SafeBrowsingService::RefreshState()
// Check if any profile requires the service to be active.
enabled_by_prefs_ = false;
@@ -2226,10 +2227,10 @@
#endif
--- a/chrome/browser/signin/chrome_signin_client.cc
+++ b/chrome/browser/signin/chrome_signin_client.cc
@@ -38,7 +38,6 @@
#include "components/prefs/pref_service.h"
@@ -39,7 +39,6 @@
#include "components/signin/core/browser/cookie_settings_util.h"
#include "components/signin/public/base/signin_buildflags.h"
#include "components/signin/public/base/signin_client.h"
-#include "components/signin/public/base/signin_pref_names.h"
#include "components/signin/public/identity_manager/access_token_info.h"
#include "components/signin/public/identity_manager/identity_manager.h"
@@ -2285,7 +2286,7 @@
#include "google_apis/gaia/gaia_switches.h"
--- a/chrome/browser/signin/primary_account_policy_manager.cc
+++ b/chrome/browser/signin/primary_account_policy_manager.cc
@@ -15,7 +15,6 @@
@@ -16,7 +16,6 @@
#include "chrome/grit/generated_resources.h"
#include "components/prefs/pref_service.h"
#include "components/signin/public/base/signin_metrics.h"
@@ -2293,7 +2294,7 @@
#include "components/signin/public/identity_manager/account_info.h"
#include "components/signin/public/identity_manager/identity_manager.h"
#include "components/signin/public/identity_manager/identity_utils.h"
@@ -179,23 +178,11 @@ void PrimaryAccountPolicyManager::Initia
@@ -180,23 +179,11 @@ void PrimaryAccountPolicyManager::Initia
EnsurePrimaryAccountAllowedForProfile(
profile_, signin_metrics::SIGNIN_NOT_ALLOWED_ON_PROFILE_INIT);
@@ -2317,7 +2318,7 @@
}
void PrimaryAccountPolicyManager::OnGoogleServicesUsernamePatternChanged() {
@@ -220,11 +207,6 @@ void PrimaryAccountPolicyManager::Ensure
@@ -221,11 +208,6 @@ void PrimaryAccountPolicyManager::Ensure
CoreAccountInfo primary_account =
identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync);
@@ -2570,7 +2571,7 @@
#include "components/sync/driver/sync_service.h"
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -61,7 +61,6 @@
@@ -62,7 +62,6 @@
#include "components/services/screen_ai/buildflags/buildflags.h"
#include "components/sessions/core/tab_restore_service.h"
#include "components/signin/public/base/signin_buildflags.h"
@@ -2578,7 +2579,7 @@
#include "content/public/browser/native_web_keyboard_event.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
@@ -216,10 +215,6 @@ BrowserCommandController::BrowserCommand
@@ -217,10 +216,6 @@ BrowserCommandController::BrowserCommand
&BrowserCommandController::UpdateCommandsForFullscreenMode,
base::Unretained(this)));
#endif
@@ -2589,7 +2590,7 @@
InitCommandState();
@@ -1629,7 +1624,7 @@ void BrowserCommandController::UpdateSho
@@ -1616,7 +1611,7 @@ void BrowserCommandController::UpdateSho
return;
command_updater_.UpdateCommandEnabled(
@@ -2600,7 +2601,7 @@
void BrowserCommandController::UpdateReloadStopState(bool is_loading,
--- a/chrome/browser/ui/browser_command_controller.h
+++ b/chrome/browser/ui/browser_command_controller.h
@@ -212,7 +212,6 @@ class BrowserCommandController : public
@@ -208,7 +208,6 @@ class BrowserCommandController : public
PrefChangeRegistrar profile_pref_registrar_;
PrefChangeRegistrar local_pref_registrar_;
@@ -2620,7 +2621,7 @@
#include "ui/events/keycodes/keyboard_codes.h"
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -64,7 +64,6 @@
@@ -63,7 +63,6 @@
#if !BUILDFLAG(IS_ANDROID)
#include "base/metrics/histogram_functions.h"
#include "chrome/browser/signin/identity_manager_factory.h"
@@ -2628,7 +2629,7 @@
#include "components/signin/public/identity_manager/identity_manager.h"
#endif
@@ -592,13 +591,7 @@ void ShowBrowserSignin(Browser* browser,
@@ -593,13 +592,7 @@ void ShowBrowserSignin(Browser* browser,
void ShowBrowserSigninOrSettings(Browser* browser,
signin_metrics::AccessPoint access_point) {
@@ -2654,7 +2655,7 @@
#include "components/unified_consent/pref_names.h"
#include "components/version_info/channel.h"
@@ -138,9 +136,6 @@ bool HasNonDefaultPrivacySetting(Profile
@@ -247,9 +245,6 @@ bool HasNonDefaultPrivacySetting(Profile
auto* prefs = profile->GetPrefs();
std::vector<std::string> prefs_to_check = {
@@ -2664,7 +2665,7 @@
prefs::kEnableDoNotTrack,
password_manager::prefs::kPasswordLeakDetectionEnabled,
prefs::kCookieControlsMode,
@@ -158,13 +153,9 @@ bool HasNonDefaultPrivacySetting(Profile
@@ -267,13 +262,9 @@ bool HasNonDefaultPrivacySetting(Profile
// Users consenting to sync automatically enable UKM collection
auto* ukm_pref = prefs->FindPreference(
unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled);
@@ -2806,7 +2807,7 @@
break;
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -39,7 +39,6 @@
@@ -40,7 +40,6 @@
#include "components/download/public/common/download_item.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/core/common/features.h"
@@ -2835,7 +2836,7 @@
--- a/chrome/browser/ui/webui/management/management_ui_handler.cc
+++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -33,7 +33,6 @@
@@ -35,7 +35,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/managed_ui.h"
#include "chrome/common/pref_names.h"
@@ -2877,7 +2878,7 @@
#endif // CHROME_BROWSER_UI_WEBUI_PROFILE_INFO_WATCHER_H_
--- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
+++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
@@ -20,7 +20,6 @@
@@ -21,7 +21,6 @@
#include "components/safe_browsing/content/browser/password_protection/password_protection_service.h"
#include "components/safe_browsing/core/browser/password_protection/metrics_util.h"
#include "components/safe_browsing/core/common/proto/csd.pb.h"
@@ -2926,7 +2927,7 @@
#include "components/signin/public/base/signin_buildflags.h"
#include "components/strings/grit/components_chromium_strings.h"
#include "components/strings/grit/components_strings.h"
@@ -1587,44 +1586,6 @@ void AddPrivacyStrings(content::WebUIDat
@@ -1706,44 +1705,6 @@ void AddPrivacyStrings(content::WebUIDat
{"clearBrowsingData", IDS_SETTINGS_CLEAR_BROWSING_DATA},
{"clearBrowsingDataDescription", IDS_SETTINGS_CLEAR_DATA_DESCRIPTION},
{"titleAndCount", IDS_SETTINGS_TITLE_AND_COUNT},
@@ -2971,7 +2972,7 @@
{"safeBrowsingSectionLabel", IDS_SETTINGS_SAFEBROWSING_SECTION_LABEL},
{"syncAndGoogleServicesPrivacyDescription",
IDS_SETTINGS_SYNC_AND_GOOGLE_SERVICES_PRIVACY_DESC_UNIFIED_CONSENT},
@@ -2943,11 +2904,6 @@ void AddSiteSettingsStrings(content::Web
@@ -3130,11 +3091,6 @@ void AddSiteSettingsStrings(content::Web
html_source->AddLocalizedStrings(kSensorsLocalizedStrings);
html_source->AddBoolean(
@@ -2985,15 +2986,15 @@
--- a/chrome/browser/ui/webui/settings/settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -78,7 +78,6 @@
#include "components/pref_registry/pref_registry_syncable.h"
@@ -80,7 +80,6 @@
#include "components/prefs/pref_service.h"
#include "components/privacy_sandbox/privacy_sandbox_features.h"
#include "components/safe_browsing/core/common/features.h"
-#include "components/signin/public/base/signin_pref_names.h"
#include "components/sync/base/features.h"
#include "content/public/browser/url_data_source.h"
#include "content/public/browser/web_contents.h"
@@ -274,9 +273,7 @@ SettingsUI::SettingsUI(content::WebUI* w
@@ -275,9 +274,7 @@ SettingsUI::SettingsUI(content::WebUI* w
std::make_unique<IncompatibleApplicationsHandler>());
#endif // BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -3025,7 +3026,7 @@
default_email.clear();
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -70,7 +70,6 @@
@@ -69,7 +69,6 @@
#include "components/prefs/pref_service.h"
#include "components/signin/core/browser/about_signin_internals.h"
#include "components/signin/public/base/signin_metrics.h"
@@ -3035,7 +3036,7 @@
#include "components/signin/public/identity_manager/identity_manager.h"
--- a/chrome/browser/ui/webui/signin/signin_error_ui.cc
+++ b/chrome/browser/ui/webui/signin/signin_error_ui.cc
@@ -28,7 +28,6 @@
@@ -29,7 +29,6 @@
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/signin_resources.h"
#include "components/prefs/pref_service.h"
@@ -3043,7 +3044,7 @@
#include "components/strings/grit/components_strings.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
@@ -111,9 +110,7 @@ void SigninErrorUI::Initialize(Browser*
@@ -112,9 +111,7 @@ void SigninErrorUI::Initialize(Browser*
if (is_profile_blocked) {
source->AddLocalizedString("profileBlockedMessage",
IDS_OLD_PROFILES_DISABLED_MESSAGE);
@@ -3094,7 +3095,7 @@
}
--- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
+++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
@@ -42,7 +42,6 @@
@@ -43,7 +43,6 @@
#include "components/policy/core/common/management/management_service.h"
#include "components/prefs/pref_service.h"
#include "components/signin/public/base/signin_metrics.h"
@@ -3102,7 +3103,7 @@
#include "components/signin/public/identity_manager/accounts_mutator.h"
#include "components/signin/public/identity_manager/identity_manager.h"
#include "components/signin/public/identity_manager/primary_account_mutator.h"
@@ -269,8 +268,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna
@@ -270,8 +269,7 @@ void TurnSyncOnHelper::TurnSyncOnInterna
// last authenticated account of the current profile, then Chrome will show a
// confirmation dialog before starting sync.
// TODO(skym): Warn for high risk upgrade scenario (https://crbug.com/572754).
@@ -3124,7 +3125,7 @@
#include "components/signin/public/identity_manager/identity_test_utils.h"
--- a/chrome/browser/ui/webui/welcome/welcome_ui.cc
+++ b/chrome/browser/ui/webui/welcome/welcome_ui.cc
@@ -24,7 +24,6 @@
@@ -25,7 +25,6 @@
#include "chrome/grit/welcome_resources.h"
#include "chrome/grit/welcome_resources_map.h"
#include "components/prefs/pref_service.h"
@@ -3132,9 +3133,9 @@
#include "components/strings/grit/components_strings.h"
#include "net/base/url_util.h"
#include "ui/base/webui/web_ui_util.h"
@@ -168,7 +167,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web
@@ -169,7 +168,7 @@ WelcomeUI::WelcomeUI(content::WebUI* web
"returningUserModules",
welcome::GetModules(profile).FindKey("returning-user")->GetString());
welcome::GetModules(profile).Find("returning-user")->GetString());
html_source->AddBoolean(
- "signinAllowed", profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed));
+ "signinAllowed", false);
@@ -3151,7 +3152,7 @@
#include "components/spellcheck/browser/pref_names.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "components/unified_consent/unified_consent_metrics.h"
@@ -39,7 +38,6 @@ namespace {
@@ -35,7 +34,6 @@ namespace {
std::vector<std::string> GetSyncedServicePrefNames() {
return {
prefs::kSearchSuggestEnabled, embedder_support::kAlternateErrorPagesEnabled,
@@ -3180,7 +3181,7 @@
"value": ["searchSuggestEnabled", {"type":"boolean"}],
--- a/components/password_manager/core/browser/leak_detection_delegate.cc
+++ b/components/password_manager/core/browser/leak_detection_delegate.cc
@@ -23,7 +23,6 @@
@@ -19,7 +19,6 @@
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
#include "components/prefs/pref_service.h"
@@ -3188,7 +3189,7 @@
#include "services/network/public/cpp/shared_url_loader_factory.h"
namespace password_manager {
@@ -189,28 +188,7 @@ void LeakDetectionDelegate::OnError(Leak
@@ -162,28 +161,7 @@ void LeakDetectionDelegate::OnError(Leak
bool CanStartLeakCheck(const PrefService& prefs,
PasswordManagerClient* client) {
@@ -3251,7 +3252,7 @@
--- a/components/password_manager/core/browser/password_reuse_manager_impl.cc
+++ b/components/password_manager/core/browser/password_reuse_manager_impl.cc
@@ -11,7 +11,6 @@
@@ -12,7 +12,6 @@
#include "components/password_manager/core/browser/password_store_signin_notifier.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/prefs/pref_service.h"
@@ -3259,7 +3260,7 @@
using base::RecordAction;
using base::UserMetricsAction;
@@ -340,20 +339,6 @@ void PasswordReuseManagerImpl::ScheduleP
@@ -342,20 +341,6 @@ void PasswordReuseManagerImpl::ScheduleP
void PasswordReuseManagerImpl::ScheduleEnterprisePasswordURLUpdate() {
DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
@@ -3279,10 +3280,10 @@
- std::move(enterprise_change_password_url)));
}
void PasswordReuseManagerImpl::OnGetPasswordStoreResults(
void PasswordReuseManagerImpl::RequestLoginsFromStores() {
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
@@ -40,7 +40,6 @@
@@ -41,7 +41,6 @@
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/password_manager/core/common/password_manager_pref_names.h"
#include "components/prefs/pref_service.h"
@@ -3416,7 +3417,7 @@
--- a/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
+++ b/components/safe_browsing/content/browser/triggers/trigger_throttler.cc
@@ -146,28 +146,6 @@ void TriggerThrottler::LoadTriggerEvents
@@ -147,28 +147,6 @@ void TriggerThrottler::LoadTriggerEvents
trigger_events_.clear();
if (!local_state_prefs_)
return;
@@ -3445,13 +3446,13 @@
}
void TriggerThrottler::WriteTriggerEventsToPref() {
@@ -183,9 +161,6 @@ void TriggerThrottler::WriteTriggerEvent
pref_timestamps->Append(base::Value(timestamp.ToDoubleT()));
}
@@ -185,9 +163,6 @@ void TriggerThrottler::WriteTriggerEvent
trigger_dict.Set(base::NumberToString(static_cast<int>(trigger_item.first)),
std::move(timestamps));
}
-
- local_state_prefs_->Set(prefs::kSafeBrowsingTriggerEventTimestamps,
- trigger_dict);
- local_state_prefs_->SetDict(prefs::kSafeBrowsingTriggerEventTimestamps,
- std::move(trigger_dict));
}
size_t TriggerThrottler::GetDailyQuotaForTrigger(
@@ -3495,7 +3496,7 @@
#include "content/public/browser/global_routing_id.h"
#include "services/network/public/mojom/cookie_manager.mojom.h"
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -1486,17 +1485,7 @@ std::string SerializeHitReport(const Hit
@@ -1489,17 +1488,7 @@ std::string SerializeHitReport(const Hit
}
hit_report_dict.Set("threat_source", threat_source);
std::string extended_reporting_level;
@@ -3513,7 +3514,7 @@
hit_report_dict.Set("extended_reporting_level", extended_reporting_level);
hit_report_dict.Set("is_enhanced_protection",
hit_report.is_enhanced_protection);
@@ -2377,18 +2366,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
@@ -2383,18 +2372,13 @@ void SafeBrowsingUIHandler::GetPrefs(con
AllowJavascript();
DCHECK(!args.empty());
std::string callback_id = args[0].GetString();
@@ -3563,7 +3564,7 @@
--- a/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
+++ b/components/safe_browsing/core/browser/db/v4_local_database_manager.cc
@@ -335,10 +335,9 @@ const V4LocalDatabaseManager*
@@ -328,10 +328,9 @@ const V4LocalDatabaseManager*
scoped_refptr<V4LocalDatabaseManager> V4LocalDatabaseManager::Create(
const base::FilePath& base_path,
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
@@ -3576,7 +3577,7 @@
std::move(io_task_runner), nullptr));
}
@@ -361,14 +360,12 @@ void V4LocalDatabaseManager::CollectData
@@ -354,14 +353,12 @@ void V4LocalDatabaseManager::CollectData
V4LocalDatabaseManager::V4LocalDatabaseManager(
const base::FilePath& base_path,
@@ -3591,7 +3592,7 @@
list_infos_(GetListInfos()),
task_runner_(task_runner_for_tests
? task_runner_for_tests
@@ -1129,8 +1126,7 @@ void V4LocalDatabaseManager::SetupUpdate
@@ -1094,8 +1091,7 @@ void V4LocalDatabaseManager::SetupUpdate
weak_factory_.GetWeakPtr());
v4_update_protocol_manager_ = V4UpdateProtocolManager::Create(
@@ -3613,7 +3614,7 @@
V4LocalDatabaseManager(const V4LocalDatabaseManager&) = delete;
V4LocalDatabaseManager& operator=(const V4LocalDatabaseManager&) = delete;
@@ -108,7 +107,6 @@ class V4LocalDatabaseManager : public Sa
@@ -106,7 +105,6 @@ class V4LocalDatabaseManager : public Sa
// Must be initialized by calling StartOnIOThread() before using.
V4LocalDatabaseManager(
const base::FilePath& base_path,
@@ -3621,7 +3622,7 @@
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
scoped_refptr<base::SequencedTaskRunner> io_task_runner,
scoped_refptr<base::SequencedTaskRunner> task_runner_for_tests);
@@ -395,10 +393,6 @@ class V4LocalDatabaseManager : public Sa
@@ -391,10 +389,6 @@ class V4LocalDatabaseManager : public Sa
// ready to process next update.
DatabaseUpdatedCallback db_updated_callback_;
@@ -4195,7 +4196,7 @@
}
TailoredSecurityService::~TailoredSecurityService() {
@@ -406,24 +396,6 @@ void TailoredSecurityService::MaybeNotif
@@ -407,24 +397,6 @@ void TailoredSecurityService::MaybeNotif
return;
}
@@ -4219,7 +4220,7 @@
- }
}
void TailoredSecurityService::QueryTailoredSecurityBitCompletionCallback(
void TailoredSecurityService::
--- a/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_observer_util.cc
+++ b/components/safe_browsing/core/browser/tailored_security_service/tailored_security_service_observer_util.cc
@@ -7,37 +7,19 @@
@@ -4348,7 +4349,7 @@
return is_safe_browsing_enabled_managed && is_safe_browsing_enhanced_managed;
--- a/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
+++ b/components/safe_browsing/core/common/safe_browsing_prefs_unittest.cc
@@ -12,7 +12,6 @@
@@ -13,7 +13,6 @@
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/testing_pref_service.h"
#include "components/safe_browsing/core/common/features.h"
@@ -4742,14 +4743,14 @@
#include "components/signin/public/identity_manager/identity_test_environment.h"
--- a/components/signin/core/browser/dice_account_reconcilor_delegate.cc
+++ b/components/signin/core/browser/dice_account_reconcilor_delegate.cc
@@ -12,7 +12,6 @@
#include "base/ranges/algorithm.h"
#include "components/prefs/pref_service.h"
@@ -14,7 +14,6 @@
#include "components/signin/public/base/consent_level.h"
#include "components/signin/public/base/signin_client.h"
#include "components/signin/public/base/signin_metrics.h"
-#include "components/signin/public/base/signin_pref_names.h"
#include "components/signin/public/identity_manager/accounts_mutator.h"
#include "components/signin/public/identity_manager/identity_manager.h"
#include "components/signin/public/identity_manager/primary_account_mutator.h"
--- a/components/signin/internal/identity_manager/account_tracker_service.cc
+++ b/components/signin/internal/identity_manager/account_tracker_service.cc
@@ -35,7 +35,6 @@
@@ -5092,7 +5093,7 @@
#include "components/signin/public/base/signin_switches.h"
using signin::PrimaryAccountChangeEvent;
@@ -44,23 +43,10 @@ PrimaryAccountManager::~PrimaryAccountMa
@@ -79,23 +78,10 @@ PrimaryAccountManager::~PrimaryAccountMa
// static
void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -5116,7 +5117,7 @@
}
void PrimaryAccountManager::Initialize(PrefService* local_state) {
@@ -68,25 +54,7 @@ void PrimaryAccountManager::Initialize(P
@@ -103,27 +89,9 @@ void PrimaryAccountManager::Initialize(P
DCHECK(!IsInitialized());
initialized_ = true;
@@ -5124,8 +5125,10 @@
- // clear their login info also (not valid to be logged in without any
- // tokens).
- base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(),
/*commit_on_destroy*/ false);
- if (cmd_line->HasSwitch(switches::kClearTokenService))
- SetPrimaryAccountInternal(CoreAccountInfo(), false);
- SetPrimaryAccountInternal(CoreAccountInfo(), false, scoped_pref_commit);
-
- std::string pref_account_id =
- client_->GetPrefs()->GetString(prefs::kGoogleServicesAccountId);
@@ -5143,7 +5146,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (!pref_account_id.empty()) {
@@ -97,15 +65,13 @@ void PrimaryAccountManager::Initialize(P
@@ -134,15 +102,13 @@ void PrimaryAccountManager::Initialize(P
// |account_info.gaia| could be empty if |account_id| is already gaia id.
if (!account_info.gaia.empty()) {
pref_account_id = account_info.gaia;
@@ -5160,7 +5163,7 @@
CoreAccountId account_id = CoreAccountId::FromString(pref_account_id);
CoreAccountInfo account_info =
account_tracker_service_->GetAccountInfo(account_id);
@@ -180,8 +146,7 @@ void PrimaryAccountManager::SetSyncPrima
@@ -221,8 +187,7 @@ void PrimaryAccountManager::SetSyncPrima
#if DCHECK_IS_ON()
{
@@ -5170,28 +5173,29 @@
bool consented_to_sync =
client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
@@ -197,10 +162,6 @@ void PrimaryAccountManager::SetSyncPrima
@@ -243,10 +208,6 @@ void PrimaryAccountManager::SetSyncPrima
// Go ahead and update the last signed in account info here as well. Once a
// user is signed in the corresponding preferences should match. Doing it here
// as opposed to on signin allows us to catch the upgrade scenario.
- client_->GetPrefs()->SetString(prefs::kGoogleServicesLastGaiaId,
- account_info.gaia);
- client_->GetPrefs()->SetString(prefs::kGoogleServicesLastUsername,
- account_info.email);
- scoped_pref_commit.SetString(prefs::kGoogleServicesLastGaiaId,
- account_info.gaia);
- scoped_pref_commit.SetString(prefs::kGoogleServicesLastUsername,
- account_info.email);
}
// Commit primary sync account info immediately so that it does not get lost
// if Chrome crashes before the next commit interval.
@@ -214,20 +175,11 @@ void PrimaryAccountManager::SetPrimaryAc
void PrimaryAccountManager::SetPrimaryAccountInternal(
@@ -256,21 +217,11 @@ void PrimaryAccountManager::SetPrimaryAc
primary_account_info_ = account_info;
PrefService* prefs = client_->GetPrefs();
const std::string& account_id = primary_account_info_.account_id.ToString();
- if (account_id.empty()) {
- DCHECK(!consented_to_sync);
- prefs->ClearPref(prefs::kGoogleServicesAccountId);
- prefs->ClearPref(prefs::kGoogleServicesConsentedToSync);
- scoped_pref_commit.SetString(prefs::kGoogleServicesAccountId, "");
- scoped_pref_commit.SetBoolean(prefs::kGoogleServicesConsentedToSync, false);
- } else {
- prefs->SetString(prefs::kGoogleServicesAccountId, account_id);
- prefs->SetBoolean(prefs::kGoogleServicesConsentedToSync, consented_to_sync);
- scoped_pref_commit.SetString(prefs::kGoogleServicesAccountId, account_id);
- scoped_pref_commit.SetBoolean(prefs::kGoogleServicesConsentedToSync,
- consented_to_sync);
- }
}
@@ -5411,7 +5415,7 @@
#include "components/signin/public/identity_manager/identity_test_utils.h"
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -100557,7 +100557,6 @@ Full version information for the fingerp
@@ -100544,7 +100544,6 @@ Full version information for the fingerp
<int value="3" label="kRestoreOnStartup"/>
<int value="4" label="kURLsToRestoreOnStartup"/>
<int value="5" label="extensions::pref_names::kExtensions"/>
@@ -5419,7 +5423,7 @@
<int value="7" label="kSearchProviderOverrides"/>
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
@@ -100572,10 +100571,7 @@ Full version information for the fingerp
@@ -100559,10 +100558,7 @@ Full version information for the fingerp
<int value="18" label="kSafeBrowsingIncidentsSent"/>
<int value="19" label="kSwReporterPromptVersion"/>
<int value="20" label="kSwReporterPromptReason"/>

3
patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch
View File

@@ -1,6 +1,6 @@
--- a/components/search_engines/prepopulated_engines.json
+++ b/components/search_engines/prepopulated_engines.json
@@ -114,24 +114,11 @@
@@ -114,25 +114,11 @@
},
"google": {
@@ -15,6 +15,7 @@
- "side_search_param": "sidesearch",
- "side_image_search_param": "sideimagesearch",
- "image_search_branding_label": "Google Lens",
- "search_intent_params": ["si", "gs_ssp"],
- "alternate_urls": [
- "{google:baseURL}#q={searchTerms}",
- "{google:baseURL}search#q={searchTerms}",

8
patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
View File

@@ -9,7 +9,7 @@
#include "components/translate/core/browser/translate_download_manager.h"
#include "components/translate/core/browser/translate_manager.h"
#include "components/translate/core/browser/translate_prefs.h"
@@ -1820,6 +1821,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -1818,6 +1819,7 @@ void RenderViewContextMenu::AppendPageIt
menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
if (CanTranslate(/*menu_logging=*/true)) {
@@ -47,8 +47,8 @@
request_pending_ = true;
--- a/components/translate/core/browser/translate_manager.cc
+++ b/components/translate/core/browser/translate_manager.cc
@@ -888,8 +888,9 @@ void TranslateManager::FilterIsTranslate
->LogAutofillAssistantDeferredTriggerDecision();
@@ -865,8 +865,9 @@ void TranslateManager::FilterIsTranslate
TriggerDecision::kDisabledOffline);
}
- if (!ignore_missing_key_for_testing_ &&
@@ -88,7 +88,7 @@
translate_event->set_ranker_version(GetModelVersion());
--- a/components/translate/core/browser/translate_script.cc
+++ b/components/translate/core/browser/translate_script.cc
@@ -137,8 +137,13 @@ void TranslateScript::OnScriptFetchCompl
@@ -136,8 +136,13 @@ void TranslateScript::OnScriptFetchCompl
server_params.c_str());
GURL security_origin = translate::GetTranslateSecurityOrigin();

26
patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
View File

@@ -9,7 +9,7 @@
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2447,6 +2447,7 @@ static_library("browser") {
@@ -2436,6 +2436,7 @@ static_library("browser") {
"//third_party/libyuv",
"//third_party/metrics_proto",
"//third_party/re2",
@@ -44,7 +44,7 @@
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -248,6 +248,7 @@ source_set("browser") {
@@ -246,6 +246,7 @@ source_set("browser") {
"//third_party/libyuv",
"//third_party/re2",
"//third_party/sqlite",
@@ -54,7 +54,7 @@
"//third_party/zlib/google:zip",
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -77,6 +77,7 @@
@@ -76,6 +76,7 @@
#include "components/services/storage/public/cpp/quota_error_or.h"
#include "components/services/storage/public/mojom/cache_storage_control.mojom.h"
#include "components/tracing/common/tracing_switches.h"
@@ -62,7 +62,7 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/attribution_reporting/attribution_manager.h"
@@ -3314,6 +3315,8 @@ void RenderProcessHostImpl::PropagateBro
@@ -3362,6 +3363,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
@@ -124,7 +124,7 @@
#include "base/ranges/algorithm.h"
#include "base/time/time.h"
#include "cc/animation/animation_host.h"
@@ -923,6 +924,14 @@ Range* Document::CreateRangeAdjustedToTr
@@ -924,6 +925,14 @@ Range* Document::CreateRangeAdjustedToTr
Position::BeforeNode(*shadow_host));
}
@@ -139,7 +139,7 @@
SelectorQueryCache& Document::GetSelectorQueryCache() {
if (!selector_query_cache_)
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
@@ -2247,6 +2256,15 @@ void Document::UpdateStyleAndLayoutTreeF
@@ -2249,6 +2258,15 @@ void Document::UpdateStyleAndLayoutTreeF
#if DCHECK_IS_ON()
AssertLayoutTreeUpdated(*this, true /* allow_dirty_container_subtrees */);
#endif
@@ -168,7 +168,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2330,6 +2334,9 @@ class CORE_EXPORT Document : public Cont
@@ -2335,6 +2339,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -180,7 +180,7 @@
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2086,6 +2086,11 @@ DOMRectList* Element::getClientRects() {
@@ -2089,6 +2089,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -192,7 +192,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2110,6 +2115,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2113,6 +2118,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -204,7 +204,7 @@
--- a/third_party/blink/renderer/core/dom/range.cc
+++ b/third_party/blink/renderer/core/dom/range.cc
@@ -1604,11 +1604,21 @@ DOMRectList* Range::getClientRects() con
@@ -1612,11 +1612,21 @@ DOMRectList* Range::getClientRects() con
Vector<gfx::QuadF> quads;
GetBorderAndTextQuads(quads);
@@ -267,7 +267,7 @@
const TextDirection&,
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc
@@ -929,9 +929,15 @@ TextMetrics* CanvasRenderingContext2D::m
@@ -938,9 +938,15 @@ TextMetrics* CanvasRenderingContext2D::m
TextDirection direction =
ToTextDirection(GetState().GetDirection(), canvas());
@@ -286,7 +286,7 @@
void CanvasRenderingContext2D::drawFormattedText(
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1655,6 +1655,7 @@ component("platform") {
@@ -1683,6 +1683,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/power_scheduler",
"//components/search_engines:search_engine_utils",
@@ -311,7 +311,7 @@
} // namespace blink
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1325,6 +1325,12 @@
@@ -1329,6 +1329,12 @@
origin_trial_feature_name: "Focusgroup",
},
{

10
patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
View File

@@ -34,7 +34,7 @@ approach to change color components.
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -3317,6 +3317,7 @@ void RenderProcessHostImpl::PropagateBro
@@ -3365,6 +3365,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
@@ -65,7 +65,7 @@ approach to change color components.
};
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
@@ -31,6 +31,7 @@
@@ -32,6 +32,7 @@
#include "third_party/blink/renderer/platform/graphics/bitmap_image.h"
#include "third_party/blink/renderer/platform/graphics/graphics_context.h"
#include "third_party/blink/renderer/platform/graphics/skia/skia_utils.h"
@@ -73,7 +73,7 @@ approach to change color components.
#include "third_party/blink/renderer/platform/graphics/stroke_data.h"
#include "third_party/blink/renderer/platform/graphics/video_frame_image_util.h"
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
@@ -2079,6 +2080,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2057,6 +2058,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -85,7 +85,7 @@ approach to change color components.
return image_data;
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1613,7 +1613,9 @@ component("platform") {
@@ -1641,7 +1641,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -322,7 +322,7 @@ approach to change color components.
// Methods overridden by all sub-classes
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1331,6 +1331,9 @@
@@ -1335,6 +1335,9 @@
name: "FingerprintingCanvasMeasureTextNoise",
},
{

12
patches/extra/bromite/flag-max-connections-per-host.patch
View File

@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2182,6 +2182,7 @@ static_library("browser") {
@@ -2170,6 +2170,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -63,7 +63,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/synchronization/waitable_event.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/task_traits.h"
@@ -104,6 +106,7 @@
@@ -103,6 +105,7 @@
#include "components/metrics/metrics_service.h"
#include "components/metrics_services_manager/metrics_services_manager.h"
#include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -71,7 +71,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/permissions/permissions_client.h"
#include "components/policy/core/common/policy_service.h"
@@ -136,6 +139,7 @@
@@ -135,6 +138,7 @@
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "net/log/net_log.h"
@@ -79,7 +79,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "ppapi/buildflags/buildflags.h"
#include "printing/buildflags/buildflags.h"
#include "services/network/public/cpp/features.h"
@@ -351,6 +355,18 @@ void BrowserProcessImpl::Init() {
@@ -354,6 +358,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -100,7 +100,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1825,6 +1825,10 @@ const char kUnthrottledNestedTimeoutDesc
@@ -1838,6 +1838,10 @@ const char kUnthrottledNestedTimeoutDesc
"websites abusing the API will still eventually have their setTimeouts "
"clamped.";
@@ -113,7 +113,7 @@ with limited CPU/memory resources and it is disabled by default.
const char kMediaRouterCastAllowAllIPsDescription[] =
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1034,6 +1034,9 @@ extern const char kLogJsConsoleMessagesD
@@ -1037,6 +1037,9 @@ extern const char kLogJsConsoleMessagesD
extern const char kUnthrottledNestedTimeoutName[];
extern const char kUnthrottledNestedTimeoutDescription[];

6
patches/extra/debian/disable/google-api-warning.patch
View File

@@ -3,9 +3,9 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -113,9 +113,6 @@ void AddInfoBarsIfNecessary(Browser* bro
infobars::ContentInfoBarManager* infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(web_contents);
@@ -125,9 +125,6 @@ void AddInfoBarsIfNecessary(Browser* bro
if (show_bad_flags_security_warnings)
chrome::ShowBadFlagsPrompt(web_contents);
- if (!google_apis::HasAPIKeyConfigured())
- GoogleApiKeysInfoBarDelegate::Create(infobar_manager);

2
patches/extra/debian/disable/welcome-page.patch
View File

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1447,11 +1447,6 @@ void ProfileManager::InitProfileUserPref
@@ -1148,11 +1148,6 @@ void ProfileManager::InitProfileUserPref
profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
supervised_user_id);
}

12
patches/extra/inox-patchset/0006-modify-default-prefs.patch
View File

@@ -12,7 +12,7 @@
void BackgroundModeManager::RegisterProfile(Profile* profile) {
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1495,7 +1495,7 @@ void ChromeContentBrowserClient::Registe
@@ -1523,7 +1523,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -34,7 +34,7 @@
registry->RegisterBooleanPref(prefs::kGloballyScopeHTTPAuthCacheEnabled,
--- a/chrome/browser/prefetch/prefetch_prefs.h
+++ b/chrome/browser/prefetch/prefetch_prefs.h
@@ -25,7 +25,7 @@ enum class NetworkPredictionOptions {
@@ -30,7 +30,7 @@ enum class NetworkPredictionOptions {
kWifiOnlyDeprecated = 1,
kDisabled = 2,
kExtended = 3,
@@ -45,7 +45,7 @@
// Enum representing possible values of the Preload Pages opt-in state. Since
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -302,7 +302,7 @@ const char Profile::kProfileKey[] = "__P
@@ -310,7 +310,7 @@ const char Profile::kProfileKey[] = "__P
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
@@ -56,7 +56,7 @@
registry->RegisterStringPref(
--- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
+++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
@@ -36,7 +36,7 @@
@@ -34,7 +34,7 @@
</cr-button>
</div>
<div slot="footer">
@@ -125,7 +125,7 @@
registry->RegisterBooleanPref(
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -66,7 +66,7 @@ void CookieSettings::RegisterProfilePref
@@ -68,7 +68,7 @@ void CookieSettings::RegisterProfilePref
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(
prefs::kCookieControlsMode,
@@ -136,7 +136,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -242,14 +242,14 @@ base::CallbackListSubscription AddSyncEn
@@ -255,14 +255,14 @@ base::CallbackListSubscription AddSyncEn
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(

2
patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch
View File

@@ -1,6 +1,6 @@
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -296,6 +296,12 @@ if (is_linux || is_chromeos) {
@@ -304,6 +304,12 @@ if (is_linux || is_chromeos) {
# These files have a suspicious comparison.
# TODO fix this and re-enable this warning.
"-Wno-sign-compare",

2
patches/extra/inox-patchset/0019-disable-battery-status-service.patch
View File

@@ -80,7 +80,7 @@
- status_ = mojom::BatteryStatus();
- status_updated_ = false;
is_shutdown_ = false;
main_thread_task_runner_ = base::ThreadTaskRunnerHandle::Get();
main_thread_task_runner_ = base::SingleThreadTaskRunner::GetCurrentDefault();
}
--- a/services/device/battery/battery_status_service.h
+++ b/services/device/battery/battery_status_service.h

2
patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1588,11 +1588,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1612,11 +1612,6 @@ int ChromeBrowserMainParts::PreMainMessa
// and preferences have been registered since some of the import code depends
// on preferences.
if (first_run::IsChromeFirstRun()) {

2
patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch
View File

@@ -11,7 +11,7 @@ very interesting in themselves. Force them to be stored.
--- a/third_party/blink/common/mime_util/mime_util.cc
+++ b/third_party/blink/common/mime_util/mime_util.cc
@@ -83,6 +83,7 @@ static const char* const kUnsupportedTex
@@ -82,6 +82,7 @@ static const char* const kUnsupportedTex
"text/x-csv",
"text/x-vcf",
"text/rtf",

2
patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch
View File

@@ -10,7 +10,7 @@ Out with all those tracking cookies!
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -82,7 +82,7 @@ void ContentSettingsRegistry::Init() {
@@ -78,7 +78,7 @@ void ContentSettingsRegistry::Init() {
// DefaultProvider::DiscardOrMigrateObsoletePreferences() accordingly.
Register(

2
patches/extra/iridium-browser/updater-disable-auto-update.patch
View File

@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -857,7 +857,7 @@ class AppControllerNativeThemeObserver :
@@ -830,7 +830,7 @@ class AppControllerNativeThemeObserver :
CFStringRef checkInterval = CFSTR("checkInterval");
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
if (!plist) {

2
patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch
View File

@@ -8,7 +8,7 @@
#include "base/observer_list.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -71,10 +72,12 @@ bool BookmarkTabHelper::ShouldShowBookma
@@ -70,10 +71,12 @@ bool BookmarkTabHelper::ShouldShowBookma
!prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar))
return false;

10
patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
View File

@@ -9,7 +9,7 @@
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -472,6 +474,7 @@ Browser::Browser(const CreateParams& par
@@ -475,6 +477,7 @@ Browser::Browser(const CreateParams& par
omit_from_session_restore_(params.omit_from_session_restore),
should_trigger_session_restore_(params.should_trigger_session_restore),
cancel_download_confirmation_state_(NOT_PROMPTED),
@@ -17,7 +17,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -833,6 +836,7 @@ Browser::WarnBeforeClosingResult Browser
@@ -836,6 +839,7 @@ Browser::WarnBeforeClosingResult Browser
// true or there are no pending downloads we need to prompt about) then
// there's no need to warn.
if (force_skip_warning_user_on_close_ || CanCloseWithInProgressDownloads())
@@ -25,7 +25,7 @@
return WarnBeforeClosingResult::kOkToClose;
DCHECK(!warn_before_closing_callback_)
@@ -867,6 +871,7 @@ bool Browser::TryToCloseWindow(
@@ -870,6 +874,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -33,7 +33,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -2772,6 +2777,62 @@ bool Browser::CanCloseWithInProgressDown
@@ -2786,6 +2791,62 @@ bool Browser::CanCloseWithInProgressDown
return false;
}
@@ -96,7 +96,7 @@
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
if (cancel_downloads) {
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
@@ -2790,6 +2851,22 @@ void Browser::InProgressDownloadResponse
@@ -2804,6 +2865,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);

2
patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -843,10 +843,14 @@ bool HandleNewTabPageLocationOverride(
@@ -849,10 +849,14 @@ bool HandleNewTabPageLocationOverride(
// Don't change the URL when incognito mode.
if (profile->IsOffTheRecord())

2
patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch
View File

@@ -33,7 +33,7 @@
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kAutomaticLazyFrameLoadingToAds);
--- a/third_party/blink/renderer/core/editing/selection_controller.cc
+++ b/third_party/blink/renderer/core/editing/selection_controller.cc
@@ -1375,10 +1375,14 @@ FrameSelection& SelectionController::Sel
@@ -1325,10 +1325,14 @@ FrameSelection& SelectionController::Sel
}
bool IsSelectionOverLink(const MouseEventWithHitTestResults& event) {

2
patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
View File

@@ -60,7 +60,7 @@
// Providers run in the order they're added. Run these async providers 1st
--- a/components/omnibox/browser/history_url_provider.cc
+++ b/components/omnibox/browser/history_url_provider.cc
@@ -475,6 +475,9 @@ void HistoryURLProvider::Start(const Aut
@@ -474,6 +474,9 @@ void HistoryURLProvider::Start(const Aut
if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
matches_.push_back(what_you_typed_match);

2
patches/extra/ungoogled-chromium/add-flag-for-qr-generator.patch
View File

@@ -27,7 +27,7 @@
return true;
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -314,7 +314,8 @@ void LocationBarView::Init() {
@@ -307,7 +307,8 @@ void LocationBarView::Init() {
params.types_enabled.push_back(PageActionIconType::kSendTabToSelf);
params.types_enabled.push_back(PageActionIconType::kClickToCall);

12
patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
View File

@@ -48,7 +48,7 @@
#include "base/containers/contains.h"
#include "base/debug/crash_logging.h"
#include "base/format_macros.h"
@@ -204,6 +205,12 @@ bool IsCreatedByExtension(const Template
@@ -205,6 +206,12 @@ bool IsCreatedByExtension(const Template
template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION;
}
@@ -61,7 +61,7 @@
} // namespace
// TemplateURLService::LessWithPrefix -----------------------------------------
@@ -289,6 +296,7 @@ TemplateURLService::TemplateURLService(
@@ -290,6 +297,7 @@ TemplateURLService::TemplateURLService(
std::unique_ptr<TemplateURLServiceClient> client,
const base::RepeatingClosure& dsp_change_callback)
: prefs_(prefs),
@@ -69,7 +69,7 @@
search_terms_data_(std::move(search_terms_data)),
web_data_service_(web_data_service),
client_(std::move(client)),
@@ -370,8 +378,8 @@ bool TemplateURLService::CanAddAutogener
@@ -371,8 +379,8 @@ bool TemplateURLService::CanAddAutogener
// that may interfere with search queries). An easy heuristic for this is
// whether the user has a TemplateURL that has been manually modified (e.g.,
// renamed) connected to the same host.
@@ -80,7 +80,7 @@
}
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
@@ -1634,6 +1642,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -1666,6 +1674,8 @@ SyncDataMap TemplateURLService::CreateGU
void TemplateURLService::Init(const Initializer* initializers,
int num_initializers) {
@@ -89,7 +89,7 @@
if (client_)
client_->SetOwner(this);
@@ -1772,6 +1782,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -1804,6 +1814,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -101,7 +101,7 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -761,6 +761,8 @@ class TemplateURLService : public WebDat
@@ -770,6 +770,8 @@ class TemplateURLService : public WebDat
// ---------- Browser state related members ---------------------------------
raw_ptr<PrefService> prefs_ = nullptr;

2
patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
View File

@@ -27,7 +27,7 @@
#include "base/compiler_specific.h"
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
@@ -1635,6 +1636,8 @@ void TabStrip::OnMouseEventInTab(views::
@@ -1650,6 +1651,8 @@ void TabStrip::OnMouseEventInTab(views::
}
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {

4
patches/extra/ungoogled-chromium/add-flag-for-tabsearch-button.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -1220,7 +1220,8 @@ void BrowserCommandController::InitComma
@@ -1200,7 +1200,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);
@@ -20,7 +20,7 @@
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/themes/theme_properties.h"
@@ -141,7 +142,8 @@ TabStripRegionView::TabStripRegionView(s
@@ -143,7 +144,8 @@ TabStripRegionView::TabStripRegionView(s
return;
}

4
patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch
View File

@@ -37,7 +37,7 @@
#include "content/browser/web_package/signed_exchange_consts.h"
#include "content/browser/web_package/signed_exchange_utils.h"
#include "content/common/content_constants_internal.h"
@@ -14,6 +15,9 @@ namespace content {
@@ -12,6 +13,9 @@ namespace content {
std::string FrameAcceptHeaderValue(bool allow_sxg_responses,
BrowserContext* browser_context) {
@@ -46,4 +46,4 @@
+
std::string header_value = kFrameAcceptHeaderValue;
#if BUILDFLAG(ENABLE_JXL_DECODER)
if (allow_sxg_responses &&

2
patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
View File

@@ -8,7 +8,7 @@
#include "base/containers/adapters.h"
#include "base/containers/contains.h"
#include "base/containers/flat_map.h"
@@ -1816,6 +1817,10 @@ bool TabStripModel::CloseTabs(base::span
@@ -1829,6 +1830,10 @@ bool TabStripModel::CloseTabs(base::span
if (items.empty())
return true;

8
patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch
View File

@@ -50,7 +50,7 @@
bool IsExtensionDownload(const download::DownloadItem& download_item);
--- a/chrome/browser/download/download_target_determiner.cc
+++ b/chrome/browser/download/download_target_determiner.cc
@@ -1174,10 +1174,12 @@ DownloadConfirmationReason DownloadTarge
@@ -1186,10 +1186,12 @@ DownloadConfirmationReason DownloadTarge
return DownloadConfirmationReason::SAVE_AS;
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -75,9 +75,9 @@
#include "base/callback_helpers.h"
+#include "base/command_line.h"
#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/logging.h"
#include "base/metrics/histogram_functions.h"
@@ -248,6 +249,13 @@ bool ExtensionManagement::IsInstallation
@@ -252,6 +253,13 @@ bool ExtensionManagement::IsInstallation
bool ExtensionManagement::IsOffstoreInstallAllowed(
const GURL& url,
const GURL& referrer_url) const {
@@ -89,7 +89,7 @@
+ return true;
+ }
// No allowed install sites specified, disallow by default.
if (!global_settings_->has_restricted_install_sources)
if (!global_settings_->install_sources.has_value())
return false;
--- a/chrome/browser/ungoogled_flag_choices.h
+++ b/chrome/browser/ungoogled_flag_choices.h

2
patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
View File

@@ -13,7 +13,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1161,6 +1161,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1158,6 +1158,8 @@ WindowOpenDisposition NavigationPolicyTo
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

2
patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch
View File

@@ -21,7 +21,7 @@
#include "base/callback_helpers.h"
#include "base/compiler_specific.h"
#include "base/containers/flat_set.h"
@@ -1113,7 +1114,8 @@ void HistoryBackend::InitImpl(
@@ -1169,7 +1170,8 @@ void HistoryBackend::InitImpl(
db_->GetStartDate(&first_recorded_time_);
// Start expiring old stuff.

2
patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -80,7 +80,8 @@ void AddInfoBarsIfNecessary(Browser* bro
@@ -99,7 +99,8 @@ void AddInfoBarsIfNecessary(Browser* bro
return;
// Web apps should not display the session restore bubble (crbug.com/1264121)

10
patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch
View File

@@ -8,15 +8,15 @@
#include "base/cxx17_backports.h"
#include "base/feature_list.h"
#include "base/no_destructor.h"
@@ -30,6 +31,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
@@ -31,6 +32,7 @@
#include "chrome/browser/ui/views/frame/toolbar_button_provider.h"
#include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h"
#include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "chrome/browser/ui/views/web_apps/frame_toolbar/web_app_frame_toolbar_view.h"
#include "extensions/common/extension_features.h"
#include "ui/base/dragdrop/drag_drop_types.h"
@@ -353,6 +355,17 @@ void ExtensionsToolbarContainer::AnchorA
#include "ui/base/dragdrop/mojom/drag_drop_types.mojom-shared.h"
@@ -345,6 +347,17 @@ void ExtensionsToolbarContainer::AnchorA
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
anchor_view && anchor_view->GetVisible() ? anchor_view
: GetExtensionsButton());
@@ -34,7 +34,7 @@
widget->Show();
}
@@ -853,6 +866,9 @@ void ExtensionsToolbarContainer::UpdateC
@@ -845,6 +858,9 @@ void ExtensionsToolbarContainer::UpdateC
}
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {

2
patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1862,6 +1862,10 @@ void BrowserView::UpdateExclusiveAccessE
@@ -1874,6 +1874,10 @@ void BrowserView::UpdateExclusiveAccessE
ExclusiveAccessBubbleHideCallback bubble_first_hide_callback,
bool notify_download,
bool force_update) {

2
patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -951,6 +951,7 @@ BrowserView::BrowserView(std::unique_ptr
@@ -955,6 +955,7 @@ BrowserView::BrowserView(std::unique_ptr
AddChildView(std::make_unique<ContentsSeparator>());
side_panel_coordinator_ = std::make_unique<SidePanelCoordinator>(this);
} else {

4
patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -990,7 +990,11 @@ void Tab::UpdateIconVisibility() {
@@ -992,7 +992,11 @@ void Tab::UpdateIconVisibility() {
if (IsActive()) {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1011,6 +1015,8 @@ void Tab::UpdateIconVisibility() {
@@ -1013,6 +1017,8 @@ void Tab::UpdateIconVisibility() {
available_width -= favicon_width;
showing_close_button_ = large_enough_for_close_button;

31
patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
View File

@@ -1,33 +1,18 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -348,14 +348,30 @@ void ToolbarView::Init() {
side_panel_button_ = AddChildView(std::move(side_panel_button));
avatar_ = AddChildView(std::make_unique<AvatarToolbarButton>(browser_view_));
+
+ const base::CommandLine& command_line =
+ *base::CommandLine::ForCurrentProcess();
+ const std::string flag_value =
+ command_line.GetSwitchValueASCII("show-avatar-button");
+
+ bool in_incognito_or_guest_mode = browser_->profile()->IsIncognitoProfile() ||
+ browser_->profile()->IsGuestSession();
+
bool show_avatar_toolbar_button = true;
#if BUILDFLAG(IS_CHROMEOS_ASH)
// ChromeOS only badges Incognito and Guest icons in the browser window.
- show_avatar_toolbar_button = browser_->profile()->IsIncognitoProfile() ||
- browser_->profile()->IsGuestSession();
+ show_avatar_toolbar_button = in_incognito_or_guest_mode;
@@ -360,6 +360,17 @@ void ToolbarView::Init() {
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
show_avatar_toolbar_button = !profiles::IsPublicSession();
#endif
+
+ if (flag_value == "always")
+ const std::string sab_value = base::CommandLine::ForCurrentProcess()->
+ GetSwitchValueASCII("show-avatar-button");
+ if (sab_value == "always")
+ show_avatar_toolbar_button = true;
+ else if (flag_value == "incognito-and-guest")
+ show_avatar_toolbar_button = in_incognito_or_guest_mode;
+ else if (flag_value == "never")
+ else if (sab_value == "incognito-and-guest")
+ show_avatar_toolbar_button = browser_->profile()->IsIncognitoProfile() ||
+ browser_->profile()->IsGuestSession();
+ else if (sab_value == "never")
+ show_avatar_toolbar_button = false;
+
avatar_->SetVisible(show_avatar_toolbar_button);

4
patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
View File

@@ -35,7 +35,7 @@
// https://vasilvv.github.io/httpbis-alps/draft-vvv-httpbis-alps.html.
--- a/net/dns/host_resolver_manager.cc
+++ b/net/dns/host_resolver_manager.cc
@@ -153,11 +153,6 @@ const unsigned kMinimumTTLSeconds = kCac
@@ -156,11 +156,6 @@ const unsigned kMinimumTTLSeconds = kCac
// cached.
const int kIPv6ProbePeriodMs = 1000;
@@ -47,7 +47,7 @@
// ICANN uses this localhost address to indicate a name collision.
//
// The policy in Chromium is to fail host resolving if it resolves to
@@ -3759,7 +3754,7 @@ bool HostResolverManager::IsIPv6Reachabl
@@ -3772,7 +3767,7 @@ bool HostResolverManager::IsIPv6Reachabl
(tick_clock_->NowTicks() - last_ipv6_probe_time_).InMilliseconds() >
kIPv6ProbePeriodMs) {
SetLastIPv6ProbeResult(

6
patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
View File

@@ -427,7 +427,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -657,7 +657,8 @@ void TemplateURLService::IncrementUsageC
@@ -658,7 +658,8 @@ void TemplateURLService::IncrementUsageC
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,
@@ -437,7 +437,7 @@
DCHECK(!IsCreatedByExtension(url));
DCHECK(!keyword.empty());
DCHECK(!search_url.empty());
@@ -672,6 +673,7 @@ void TemplateURLService::ResetTemplateUR
@@ -673,6 +674,7 @@ void TemplateURLService::ResetTemplateUR
data.safe_for_autoreplace = false;
data.last_modified = clock_->Now();
data.is_active = TemplateURLData::ActiveStatus::kTrue;
@@ -447,7 +447,7 @@
}
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -257,7 +257,8 @@ class TemplateURLService : public WebDat
@@ -263,7 +263,8 @@ class TemplateURLService : public WebDat
void ResetTemplateURL(TemplateURL* url,
const std::u16string& title,
const std::u16string& keyword,

2
patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3655,7 +3655,13 @@ const FeatureEntry::FeatureVariation kFa
@@ -3319,7 +3319,13 @@ const FeatureEntry::FeatureVariation
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.

18
patches/extra/ungoogled-chromium/disable-download-quarantine.patch
View File

@@ -147,8 +147,8 @@
} // namespace download
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -96,7 +96,6 @@ source_set("browser") {
"//components/payments/mojom",
@@ -97,7 +97,6 @@ source_set("browser") {
"//components/power_monitor",
"//components/power_scheduler",
"//components/services/filesystem:lib",
- "//components/services/quarantine:quarantine",
@@ -158,18 +158,18 @@
--- a/content/browser/file_system_access/file_system_access_safe_move_helper.cc
+++ b/content/browser/file_system_access/file_system_access_safe_move_helper.cc
@@ -14,7 +14,6 @@
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/thread_annotations.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
-#include "components/services/quarantine/quarantine.h"
#include "content/browser/file_system_access/features.h"
#include "content/browser/file_system_access/file_system_access_error.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/global_routing_id.h"
@@ -210,22 +209,9 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -242,22 +241,9 @@ void FileSystemAccessSafeMoveHelper::Did
// not exist anymore. In case of error, the source file URL will point to a
// valid filesystem location.
base::OnceCallback<void(base::File::Error)> result_callback;
- if (RequireSecurityChecks()) {
- if (RequireQuarantine()) {
- GURL referrer_url = manager_->is_off_the_record() ? GURL() : context_.url;
- mojo::Remote<quarantine::mojom::Quarantine> quarantine_remote;
- if (quarantine_connection_callback_) {
@@ -188,7 +188,7 @@
manager_->DoFileSystemOperation(
FROM_HERE, &storage::FileSystemOperationRunner::Move,
std::move(result_callback), source_url(), dest_url(), options_,
@@ -242,7 +228,6 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -274,7 +260,6 @@ void FileSystemAccessSafeMoveHelper::Did
void FileSystemAccessSafeMoveHelper::DidFileDoQuarantine(
const storage::FileSystemURL& target_url,
const GURL& referrer_url,
@@ -196,7 +196,7 @@
base::File::Error result) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -273,37 +258,9 @@ void FileSystemAccessSafeMoveHelper::Did
@@ -305,37 +290,9 @@ void FileSystemAccessSafeMoveHelper::Did
referrer_url.is_valid() && referrer_url.SchemeIsHTTPOrHTTPS()
? referrer_url
: GURL();
@@ -236,7 +236,7 @@
--- a/content/browser/file_system_access/file_system_access_safe_move_helper.h
+++ b/content/browser/file_system_access/file_system_access_safe_move_helper.h
@@ -61,10 +61,8 @@ class CONTENT_EXPORT FileSystemAccessSaf
@@ -66,10 +66,8 @@ class CONTENT_EXPORT FileSystemAccessSaf
void DidFileDoQuarantine(
const storage::FileSystemURL& target_url,
const GURL& referrer_url,

2
patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch
View File

@@ -3,7 +3,7 @@
--- a/chrome/browser/intranet_redirect_detector.cc
+++ b/chrome/browser/intranet_redirect_detector.cc
@@ -119,9 +119,7 @@ void IntranetRedirectDetector::FinishSle
@@ -118,9 +118,7 @@ void IntranetRedirectDetector::FinishSle
simple_loaders_.clear();
resulting_origins_.clear();

4
patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
View File

@@ -3,7 +3,7 @@
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -3697,8 +3697,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3703,8 +3703,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3712,8 +3711,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3718,8 +3717,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_VENDOR))));
}

2
patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
View File

@@ -2,7 +2,7 @@
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -530,7 +530,7 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissa
@@ -501,7 +501,7 @@ BASE_FEATURE(kAllowSyncXHRInPageDismissa
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",

9
patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
View File

@@ -2,19 +2,18 @@
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -440,11 +440,6 @@ int GetContentRestrictions(const Browser
@@ -474,10 +474,6 @@ int GetContentRestrictions(const Browser
CoreTabHelper* core_tab_helper =
CoreTabHelper::FromWebContents(current_tab);
content_restrictions = core_tab_helper->content_restrictions();
- NavigationEntry* last_committed_entry =
- current_tab->GetController().GetLastCommittedEntry();
- if (!content::IsSavableURL(
- last_committed_entry ? last_committed_entry->GetURL() : GURL()))
- if (!content::IsSavableURL(last_committed_entry->GetURL()))
- content_restrictions |= CONTENT_RESTRICTION_SAVE;
}
return content_restrictions;
}
@@ -1342,8 +1337,7 @@ bool CanSavePage(const Browser* browser)
@@ -1379,8 +1375,7 @@ bool CanSavePage(const Browser* browser)
DownloadPrefs::DownloadRestriction::ALL_FILES) {
return false;
}
@@ -26,7 +25,7 @@
void Print(Browser* browser) {
--- a/components/offline_pages/core/offline_page_model.cc
+++ b/components/offline_pages/core/offline_page_model.cc
@@ -22,7 +22,7 @@ OfflinePageModel::SavePageParams::~SaveP
@@ -21,7 +21,7 @@ OfflinePageModel::SavePageParams::~SaveP
// static
bool OfflinePageModel::CanSaveURL(const GURL& url) {

6
patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/tabs/new_tab_button.cc
+++ b/chrome/browser/ui/views/tabs/new_tab_button.cc
@@ -59,10 +59,8 @@ NewTabButton::NewTabButton(TabStrip* tab
@@ -61,10 +61,8 @@ NewTabButton::NewTabButton(TabStrip* tab
SetAnimateOnStateChange(true);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -13,7 +13,7 @@
AddChildView(std::make_unique<views::InkDropContainerView>());
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -1884,8 +1884,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -1897,8 +1897,6 @@ void TabStrip::NewTabButtonPressed(const
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
if (mouse.IsOnlyMiddleMouseButton()) {
@@ -22,7 +22,7 @@
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
CHECK(clipboard);
std::u16string clipboard_text;
@@ -1893,7 +1891,6 @@ void TabStrip::NewTabButtonPressed(const
@@ -1906,7 +1904,6 @@ void TabStrip::NewTabButtonPressed(const
/* data_dst = */ nullptr, &clipboard_text);
if (!clipboard_text.empty())
controller_->CreateNewTabWithLocation(clipboard_text);

2
patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch
View File

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -62,7 +62,6 @@ static const char* kBadFlags[] = {
@@ -63,7 +63,6 @@ static const char* kBadFlags[] = {
// These flags disable sandbox-related security.
sandbox::policy::switches::kDisableGpuSandbox,
sandbox::policy::switches::kDisableSeccompFilterSandbox,

46
patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
View File

@@ -54,20 +54,20 @@
-</div>
--- a/chrome/browser/resources/history/side_bar.html
+++ b/chrome/browser/resources/history/side_bar.html
@@ -121,13 +121,6 @@
$i18n{historyMenuItem}
<paper-ripple></paper-ripple>
</a>
- <a id="syncedTabs" role="menuitem" href="/syncedTabs"
- class="page-item cr-nav-menu-item"
- path="syncedTabs" on-click="onItemClick_">
- <iron-icon icon="cr:phonelink"></iron-icon>
- $i18n{openTabsMenuItem}
- <paper-ripple></paper-ripple>
- </a>
<!-- tabindex is needed below because <a> without href attribute is not
focusable in sequential keyboard navigation by default. -->
<a role="menuitem" id="toggle-history-clusters"
@@ -95,13 +95,6 @@
$i18n{historyMenuItem}
<paper-ripple></paper-ripple>
</a>
- <a id="syncedTabs" role="menuitem" href="/syncedTabs"
- class="page-item cr-nav-menu-item"
- path="syncedTabs" on-click="onItemClick_">
- <iron-icon icon="cr:phonelink"></iron-icon>
- $i18n{openTabsMenuItem}
- <paper-ripple></paper-ripple>
- </a>
<!-- tabindex is needed below because <a> without href attribute is not
focusable in sequential keyboard navigation by default. -->
<a role="menuitem" id="toggle-history-clusters"
--- a/chrome/browser/resources/ntp4/incognito_tab.html
+++ b/chrome/browser/resources/ntp4/incognito_tab.html
@@ -24,9 +24,6 @@ document.querySelector('#incognitothemec
@@ -220,21 +220,19 @@
<!-- Signout is not supported yet on lacros, https://crbug.com/1217645 -->
<settings-toggle-button id="signinAllowedToggle"
class="hr"
@@ -70,14 +70,6 @@
@@ -59,12 +59,6 @@
</settings-toggle-button>
</if><!-- not chromeos -->
</if><!-- _google_chrome -->
- <template is="dom-if" if="[[showUrlCollectionToggle_()]]" restamp>
- <settings-toggle-button id="urlCollectionToggle"
- class="hr"
- pref="{{prefs.url_keyed_anonymized_data_collection.enabled}}"
- label="$i18n{urlKeyedAnonymizedDataCollection}"
- sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
- </settings-toggle-button>
- </template>
- <settings-toggle-button id="urlCollectionToggle"
- class="hr"
- pref="{{prefs.url_keyed_anonymized_data_collection.enabled}}"
- label="$i18n{urlKeyedAnonymizedDataCollection}"
- sub-label="$i18n{urlKeyedAnonymizedDataCollectionDesc}">
- </settings-toggle-button>
<if expr="_google_chrome">
<if expr="not chromeos_ash">
<settings-toggle-button id="spellCheckControl"
class="hr"
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -45,15 +45,6 @@

157
pruning.list
View File

@@ -49,36 +49,36 @@ buildtools/third_party/eu-strip/bin/eu-strip
chrome/app/etw_events/MSG00001.bin
chrome/app/etw_events/chrome_events_winTEMP.BIN
chrome/browser/ash/power/ml/smart_dim/20190521_example_preprocessor_config.pb
chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/pumpkin-2.0.tar.xz
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/alert_modal.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/alert_nonmodal.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/button.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/check_off.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/check_on.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/editable_text.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/ellipsis.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/invalid_keypress.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/link.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/list_item.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/listbox.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/long_desc.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/math.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/object_close.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/object_enter.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/object_exit.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/object_open.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/object_select.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/page_finish_loading.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/page_start_loading.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/recover_focus.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/selection.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/selection_reverse.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/skip.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/wrap.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/background/earcons/wrap_edge.ogg
chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/parse/pumpkin/pumpkin-3.0.tar.xz
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/alert_modal.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/alert_nonmodal.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/button.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/check_off.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/check_on.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/editable_text.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/ellipsis.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/invalid_keypress.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/link.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/list_item.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/listbox.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/long_desc.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/math.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/object_close.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/object_enter.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/object_exit.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/object_open.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/object_select.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/page_finish_loading.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/page_start_loading.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/recover_focus.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/selection.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/selection_reverse.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/skip.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/wrap.ogg
chrome/browser/resources/chromeos/accessibility/chromevox/earcons/wrap_edge.ogg
chrome/browser/resources/chromeos/accessibility/select_to_speak/earcons/null_selection.ogg
chrome/browser/resources/media/mei_preload/preloaded_data.pb
chrome/build/pgo_profiles/chrome-linux-5414-1673458358-f201dca2e709a6e1ee7fd65d957f970486154dba.profdata
chrome/build/pgo_profiles/chrome-linux-5481-1675162426-393d781cbc3753d814a299bfd43435032b5acfd9.profdata
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/Network Share Test.lnk
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/New folder - Shortcut.lnk
chrome/chrome_cleaner/parsers/shortcut_parser/target/data/lnk_parser_fuzzer/long_name.lnk
@@ -91,6 +91,7 @@ chrome/installer/linux/debian/repo_signing_keys.gpg
chrome/installer/test/data/SETUP.EX_
chrome/services/cups_proxy/test/data/basic_handshake.bin
chrome/test/media_router/resources/bigbuck.webm
chrome/updater/test/data/ProcmonConfiguration.pmc
chrome/updater/test/data/selfupdate_test_key.der
chrome/updater/test/data/signed.exe
chrome/updater/test/data/signed.exe.gz
@@ -99,6 +100,7 @@ chrome/updater/test/data/tag_extractor_corpus/tagged_encode_utf8.exe
chrome/updater/test/data/tag_extractor_corpus/tagged_magic_utf16.exe
chrome/updater/test/data/tagged_encode_utf8.exe
chrome/updater/test/data/tagged_magic_utf16.exe
chromeos/ash/components/device_activity/testing/private_computing_service_test_data.binarypb
chromeos/test/data/smart_dim/20181115_example_preprocessor_config.pb
components/cbor/reader_fuzzer_corpus/cbor0
components/cbor/reader_fuzzer_corpus/cbor1
@@ -176,6 +178,7 @@ components/media_router/common/providers/cast/channel/fuzz_corpus/cast_message0
components/media_router/common/providers/cast/channel/fuzz_corpus/cast_message1
components/media_router/common/providers/cast/channel/fuzz_corpus/cast_message2
components/safe_browsing/content/resources/empty_file_type_policy.pb
components/safe_browsing/content/resources/real_time_url_checks_allowlist.pb
components/safe_browsing/core/common/safe_browsing_prefs.cc
components/safe_browsing/core/common/safe_browsing_prefs.h
components/services/storage/test_data/legacy_dom_storage_database.localstorage
@@ -184,7 +187,6 @@ components/signin/public/base/signin_pref_names.h
components/test/data/ad_tagging/allow.zip
components/test/data/ad_tagging/bear-320x240-video-only.webm
components/test/data/ad_tagging/disallow.zip
components/test/data/autofill_assistant/model/model.tflite
components/test/data/crx_file/sample.zip
components/test/data/crx_file/unsigned.crx3
components/test/data/crx_file/valid.crx2
@@ -244,6 +246,7 @@ components/test/data/update_client/binary_bsdiff_patch.bin
components/test/data/update_client/binary_courgette_patch.bin
components/test/data/update_client/binary_input.bin
components/test/data/update_client/binary_output.bin
components/test/data/update_client/gndmhdcefbhlchkhipcnnbkcmicncehk_22_314.crx3
components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1/a_changing_binary_file
components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2/f1
components/test/data/update_client/ihfokbkgjpifnbbojhneepfflplebdkc/ihfokbkgjpifnbbojhneepfflplebdkc_1to2_bad/f3
@@ -265,6 +268,7 @@ components/test/data/value_store/MANIFEST-000004
components/test/data/web_package/24_responses.wbn
components/test/data/web_package/hello_b2.wbn
components/test/data/web_package/hello_vouched_subsets.wbn
components/test/data/web_package/mixed_absolute_relative_urls.wbn
components/test/data/web_package/simple_b2.wbn
components/test/data/web_package/simple_b2_signed.swbn
components/test/data/web_package/simple_b2_signed_tampered.swbn
@@ -1285,7 +1289,6 @@ net/data/ssl/certificates/google.binary.p7b
net/data/ssl/certificates/google.single.der
net/data/ssl/certificates/invalid_key_usage_cert.der
net/data/ssl/certificates/mit.davidben.der
net/data/ssl/certificates/multi-root-BFE.keychain
net/data/ssl/certificates/multi-root-crlset-C.raw
net/data/ssl/certificates/multi-root-crlset-CD-and-FE.raw
net/data/ssl/certificates/multi-root-crlset-D-and-E.raw
@@ -1299,7 +1302,6 @@ net/data/ssl/certificates/quic-leaf-cert.key.sct
net/data/ssl/certificates/treadclimber.sctlist
net/data/ssl/certificates/unittest.key.bin
net/data/ssl/certificates/unittest.selfsigned.der
net/data/ssl/certificates/verisign_class3_g5_crosssigned-trusted.keychain
net/data/ssl/certificates/websocket_client_cert.p12
net/data/url_request_unittest/BullRunSpeech.txt.deflate
net/data/url_request_unittest/gzip-encoded
@@ -2002,6 +2004,7 @@ third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Cayenne
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Cayman
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Chicago
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Chihuahua
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Ciudad_Juarez
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Coral_Harbour
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Cordoba
third_party/abseil-cpp/absl/time/internal/cctz/testdata/zoneinfo/America/Costa_Rica
@@ -9651,6 +9654,36 @@ third_party/devtools-frontend/src/test/screenshots/image_diff/mac/image_diff
third_party/devtools-frontend/src/test/screenshots/image_diff/mac/libbase.dylib
third_party/devtools-frontend/src/test/screenshots/image_diff/mac/libc++.dylib
third_party/devtools-frontend/src/test/screenshots/image_diff/mac/libchrome_zlib.dylib
third_party/devtools-frontend/src/test/unittests/fixtures/traces/animation.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/basic.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/cls-cluster-max-duration.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/cls-cluster-max-timeout.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/cls-cluster-navigation.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/cls-last-cluster-max-duration.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/cls-multiple-frames.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/cls-single-frame.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/forced-layouts-and-no-gpu.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/interactive-time.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/lcp-images.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/lcp-web-font.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/load-simple.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/missing-process-data.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/missing-tracing-start.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/multiple-navigations-with-iframes.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/multiple-navigations.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/multiple-top-level-renderers.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/recursive-blocking-js.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/recursive-counting-js.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/redirects-subresource-multiple.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/redirects.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/reload-and-trace-page.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/reload-no-tti.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/request-with-query-param.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/slow-interaction-button-click.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/slow-interaction-keydown.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/threejs-gpu.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/user-timings.json.gz
third_party/devtools-frontend/src/test/unittests/fixtures/traces/web-dev.json.gz
third_party/devtools-frontend/src/third_party/esbuild/esbuild
third_party/ffmpeg/tests/reference.pnm
third_party/flatbuffers/src/android/gradle/wrapper/gradle-wrapper.jar
@@ -13047,7 +13080,9 @@ third_party/icu/chromeos/icudtl.dat
third_party/icu/chromeos/icudtl.dat.hash
third_party/icu/flutter/icudtl.dat
third_party/icu/ios/icudtl.dat
third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu
third_party/icu/source/data/in/coll/ucadata-implicithan.icu
third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu
third_party/icu/source/data/in/coll/ucadata-unihan.icu
third_party/icu/source/data/in/nfc.nrm
third_party/icu/source/data/in/nfkc.nrm
@@ -16599,6 +16634,19 @@ third_party/llvm/llvm/test/tools/llvm-cxxdump/Inputs/eh.obj.coff-i386
third_party/llvm/llvm/test/tools/llvm-cxxdump/Inputs/mixed-archive.coff-i386
third_party/llvm/llvm/test/tools/llvm-cxxdump/Inputs/trivial.obj.coff-i386
third_party/llvm/llvm/test/tools/llvm-cxxdump/Inputs/trivial.obj.elf-i386
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/hello-world-dwarf-clang.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/hello-world-dwarf-gcc.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-43860-dwarf-clang.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-43860-dwarf-gcc.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-44884-dwarf-clang.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-44884-dwarf-gcc.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-46466-dwarf-clang.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-46466-dwarf-gcc.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-57040-test-dwarf-clang.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-57040-test-dwarf-gcc.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/pr-incorrect-instructions-dwarf-clang.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/test-dwarf-clang.o
third_party/llvm/llvm/test/tools/llvm-debuginfo-analyzer/DWARF/Inputs/test-dwarf-gcc.o
third_party/llvm/llvm/test/tools/llvm-debuginfod/Inputs/main-debug.exe
third_party/llvm/llvm/test/tools/llvm-debuginfod/Inputs/main.exe
third_party/llvm/llvm/test/tools/llvm-dwarfdump/X86/Inputs/empty.dSYM
@@ -17047,6 +17095,8 @@ third_party/llvm/llvm/test/tools/sancov/Inputs/test-windows_x86_64
third_party/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/model.tflite
third_party/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/variables/variables.data-00000-of-00001
third_party/llvm/llvm/unittests/Analysis/Inputs/ir2native_x86_64_model/variables/variables.index
third_party/llvm/llvm/unittests/DebugInfo/LogicalView/Inputs/test-dwarf-clang.o
third_party/llvm/llvm/unittests/DebugInfo/LogicalView/Inputs/test-dwarf-gcc.o
third_party/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.exe
third_party/llvm/llvm/unittests/DebugInfo/PDB/Inputs/SimpleTest.pdb
third_party/llvm/llvm/unittests/DebugInfo/PDB/Inputs/empty.pdb
@@ -17495,18 +17545,6 @@ third_party/pywebsocket3/src/test/cert/client_cert.p12
third_party/quic_trace/src/examples/example.json.gz
third_party/quic_trace/src/examples/example.qtr
third_party/r8/custom_d8.jar
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_abbrev
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_aranges
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_info
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_inlined
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_line
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_loc
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_pubnames
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_pubtypes
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_ranges
third_party/rust/gimli/v0_26/crate/fixtures/self/debug_str
third_party/rust/gimli/v0_26/crate/fixtures/self/eh_frame
third_party/rust/gimli/v0_26/crate/fixtures/self/eh_frame_hdr
third_party/rust/libloading/v0_7/crate/tests/nagisa32.dll
third_party/rust/libloading/v0_7/crate/tests/nagisa64.dll
third_party/rust/regex/v1/crate/src/testdata/basic.dat
@@ -17732,6 +17770,7 @@ third_party/tflite/src/tensorflow/cc/saved_model/testdata/StaticHashTableModule/
third_party/tflite/src/tensorflow/cc/saved_model/testdata/StaticHashTableModule/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/cc/saved_model/testdata/StaticHashTableModule/variables/variables.index
third_party/tflite/src/tensorflow/cc/saved_model/testdata/VarsAndArithmeticObjectGraph/debug/saved_model_debug_info.pb
third_party/tflite/src/tensorflow/cc/saved_model/testdata/VarsAndArithmeticObjectGraph/fingerprint.pb
third_party/tflite/src/tensorflow/cc/saved_model/testdata/VarsAndArithmeticObjectGraph/saved_model.pb
third_party/tflite/src/tensorflow/cc/saved_model/testdata/VarsAndArithmeticObjectGraph/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/cc/saved_model/testdata/VarsAndArithmeticObjectGraph/variables/variables.index
@@ -18217,29 +18256,6 @@ third_party/tflite/src/third_party/icu/data/icu_conversion_data.c.gz.adg
third_party/tflite/src/third_party/icu/data/icu_conversion_data.c.gz.adh
third_party/tflite_support/src/tensorflow_lite_support/acceleration/configuration/testdata/mobilenet_v1_1.0_224_quant.tflite
third_party/tflite_support/src/tensorflow_lite_support/acceleration/configuration/testdata/mobilenet_v1_1.0_224_quant_edgetpu.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/audio/model_without_metadata.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/audio/two_heads.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/audio/yamnet_audio_classifier_with_metadata.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/audio/yamnet_audio_classifier_with_metadata_edgetpu.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/audio/yamnet_embedding_metadata.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/text/mobilebert_index.ldb
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/text/regex_index.ldb
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/text/universal_sentence_encoder_index.ldb
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/automl_labeler_model.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/coco_efficientdet_lite0_v1_1.0_quant_2021_09_06.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/coco_ssd_mobilenet_v1_1.0_quant_2018_06_29.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/coco_ssd_mobilenet_v1_1.0_quant_2018_06_29_score_calibration.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/deeplabv3.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/dilated_conv.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/mobilenet_v1_0.25_224_1_default_1.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/mobilenet_v1_0.25_224_1_metadata_1.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/mobilenet_v1_0.25_224_quant.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/mobilenet_v1_0.25_224_quant_without_subgraph_metadata.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/mobilenet_v2_1.0_224.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/mobilenet_v2_1.0_224_without_labels.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/mobilenet_v3_small_100_224_embedder.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/mobilenet_v3_small_100_224_searcher.tflite
third_party/tflite_support/src/tensorflow_lite_support/cc/test/testdata/task/vision/searcher_index.ldb
third_party/tflite_support/src/tensorflow_lite_support/custom_ops/kernel/sentencepiece/testdata/sentencepiece.model
third_party/tflite_support/src/tensorflow_lite_support/custom_ops/kernel/testdata/whitespace_tokenizer_flex_delegate.tflite
third_party/tflite_support/src/tensorflow_lite_support/custom_ops/kernel/testdata/whitespace_tokenizer_to_ragged_1d_input.tflite
@@ -18777,16 +18793,13 @@ third_party/win_build_output/midl/chrome/elevation_service/x64/elevation_service
third_party/win_build_output/midl/chrome/elevation_service/x86/elevation_service_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/arm64/updater_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/arm64/updater_internal_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/arm64/updater_legacy_idl_chrome_branded.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/arm64/updater_legacy_idl_open_source.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/arm64/updater_legacy_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x64/updater_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x64/updater_internal_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x64/updater_legacy_idl_chrome_branded.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x64/updater_legacy_idl_open_source.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x64/updater_legacy_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_internal_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl_chrome_branded.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl_open_source.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl.tlb
third_party/win_build_output/midl/google_update/arm64/google_update_idl.tlb
third_party/win_build_output/midl/google_update/x64/google_update_idl.tlb
third_party/win_build_output/midl/google_update/x86/google_update_idl.tlb