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 131.0.6778.69

Browse Source
This commit is contained in:
Blaise
2024-11-06 10:56:00 -06:00
parent a3f4b6e1a5
commit a833234d39
67 changed files with 1540 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chromium_version.txt
View File

@@ -1 +1 @@
130.0.6723.116
131.0.6778.69

361
domain_substitution.list
View File

File diff suppressed because it is too large Load Diff

8
patches/core/bromite/disable-fetching-field-trials.patch
View File

@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -54,7 +54,7 @@ public abstract class ChromeFeatureList
@@ -56,7 +56,7 @@ public abstract class ChromeFeatureList
* |kFeaturesExposedToJava| in chrome/browser/flags/android/chrome_feature_list.cc
*/
public static String getFieldTrialParamByFeature(String featureName, String paramName) {
@@ -19,7 +19,7 @@ Subject: Disable fetching of all field trials
}
/**
@@ -66,8 +66,7 @@ public abstract class ChromeFeatureList
@@ -68,8 +68,7 @@ public abstract class ChromeFeatureList
*/
public static boolean getFieldTrialParamByFeatureAsBoolean(
String featureName, String paramName, boolean defaultValue) {
@@ -29,7 +29,7 @@ Subject: Disable fetching of all field trials
}
/**
@@ -79,8 +78,7 @@ public abstract class ChromeFeatureList
@@ -81,8 +80,7 @@ public abstract class ChromeFeatureList
*/
public static int getFieldTrialParamByFeatureAsInt(
String featureName, String paramName, int defaultValue) {
@@ -39,7 +39,7 @@ Subject: Disable fetching of all field trials
}
/**
@@ -92,8 +90,7 @@ public abstract class ChromeFeatureList
@@ -94,8 +92,7 @@ public abstract class ChromeFeatureList
*/
public static double getFieldTrialParamByFeatureAsDouble(
String featureName, String paramName, double defaultValue) {

82
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
@@ -2251,7 +2251,6 @@ static_library("browser") {
@@ -2249,7 +2249,6 @@ static_library("browser") {
"//components/reporting/util:task_runner_context",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -8,8 +8,8 @@
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3636,8 +3635,6 @@ static_library("browser") {
"download/download_commands.h",
@@ -3641,8 +3640,6 @@ static_library("browser") {
"download/download_commands.cc",
"download/download_crx_util.cc",
"download/download_crx_util.h",
- "download/download_danger_prompt.cc",
@@ -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"
@@ -478,8 +477,6 @@ void BrowserProcessImpl::StartTearDown()
@@ -479,8 +478,6 @@ void BrowserProcessImpl::StartTearDown()
#endif
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -59,7 +59,7 @@
network_time_tracker_.reset();
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@@ -1166,14 +1163,6 @@ StatusTray* BrowserProcessImpl::status_t
@@ -1167,14 +1164,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_);
@@ -1485,26 +1474,6 @@ void BrowserProcessImpl::CreateBackgroun
@@ -1479,26 +1468,6 @@ void BrowserProcessImpl::CreateBackgroun
#endif
}
@@ -129,9 +129,9 @@
#include "chrome/browser/reading_list/reading_list_model_factory.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
#include "chrome/browser/search_engine_choice/search_engine_choice_service_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/share/share_history.h"
@@ -645,10 +644,6 @@ void ChromeBrowsingDataRemoverDelegate::
@@ -647,10 +646,6 @@ void ChromeBrowsingDataRemoverDelegate::
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -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
@@ -5512,10 +5512,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5513,10 +5513,6 @@ ChromeContentBrowserClient::CreateThrott
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
handle, handle->GetWebContents()->GetBrowserContext()));
@@ -155,7 +155,7 @@
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
handle,
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
@@ -5567,16 +5563,6 @@ ChromeContentBrowserClient::CreateThrott
@@ -5571,16 +5567,6 @@ ChromeContentBrowserClient::CreateThrott
&throttles);
#endif
@@ -172,7 +172,7 @@
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
throttles.push_back(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
@@ -5897,8 +5883,6 @@ bool ChromeContentBrowserClient::IsPlugi
@@ -5901,8 +5887,6 @@ bool ChromeContentBrowserClient::IsPlugi
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -207,7 +207,7 @@
} // namespace
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -533,13 +533,6 @@ void ChromeDownloadManagerDelegate::SetD
@@ -534,13 +534,6 @@ void ChromeDownloadManagerDelegate::SetD
download_manager_ = dm;
@@ -221,7 +221,7 @@
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -1007,17 +1000,6 @@ void ChromeDownloadManagerDelegate::Choo
@@ -1062,17 +1055,6 @@ void ChromeDownloadManagerDelegate::Choo
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
@@ -250,7 +250,7 @@
// Whether the download is currently being revived.
bool is_being_revived_ = false;
@@ -531,13 +531,13 @@ void DownloadItemModel::SetShouldPreferO
@@ -501,13 +501,13 @@ void DownloadItemModel::SetShouldPreferO
data->should_prefer_opening_in_browser_ = preference;
}
@@ -267,7 +267,7 @@
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -740,9 +740,6 @@ bool DownloadItemModel::IsCommandEnabled
@@ -710,9 +710,6 @@ bool DownloadItemModel::IsCommandEnabled
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -500,7 +500,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
@@ -710,18 +710,6 @@ void WebstorePrivateBeginInstallWithMani
@@ -709,18 +709,6 @@ void WebstorePrivateBeginInstallWithMani
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -519,7 +519,7 @@
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1226,54 +1214,9 @@ WebstorePrivateGetReferrerChainFunction:
@@ -1204,54 +1192,9 @@ WebstorePrivateGetReferrerChainFunction:
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
@@ -648,15 +648,15 @@
// SimpleURLLoader -> (owned loader, extension id).
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -91,7 +91,6 @@
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
@@ -95,7 +95,6 @@
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
#include "chrome/browser/reading_list/reading_list_model_factory.h"
#include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
-#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/sessions/exit_type_service.h"
#include "chrome/browser/sharing/sharing_service_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
@@ -646,17 +645,6 @@ void ProfileImpl::LoadPrefsForNormalStar
@@ -616,17 +615,6 @@ void ProfileImpl::LoadPrefsForNormalStar
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
pref_validation_delegate;
@@ -672,11 +672,11 @@
- }
- }
prefs_ =
CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false),
prefs_ = CreateProfilePrefService(
pref_registry_, CreateExtensionPrefStore(this, false),
--- a/chrome/browser/profiles/profiles_state.cc
+++ b/chrome/browser/profiles/profiles_state.cc
@@ -314,9 +314,6 @@ void RemoveBrowsingDataForProfile(const
@@ -290,9 +290,6 @@ void RemoveBrowsingDataForProfile(const
// The BrowsingDataRemover relies on many objects that aren't created in unit
// tests. Previously this code would depend on content::ResourceDispatcherHost
// but that's gone, so do a similar hack for now.
@@ -696,7 +696,7 @@
sources = [
"chrome_controller_client.cc",
"chrome_controller_client.h",
@@ -74,6 +75,7 @@ static_library("safe_browsing") {
@@ -76,6 +77,7 @@ static_library("safe_browsing") {
"//mojo/public/cpp/system",
"//services/preferences/public/cpp",
]
@@ -704,7 +704,7 @@
if (is_android) {
deps += [
@@ -525,6 +527,7 @@ static_library("advanced_protection") {
@@ -536,6 +538,7 @@ static_library("advanced_protection") {
}
source_set("metrics_collector") {
@@ -712,7 +712,7 @@
sources = [
"safe_browsing_metrics_collector_factory.cc",
"safe_browsing_metrics_collector_factory.h",
@@ -544,6 +547,7 @@ source_set("metrics_collector") {
@@ -555,6 +558,7 @@ source_set("metrics_collector") {
"//components/safe_browsing/core/common:safe_browsing_prefs",
"//content/public/browser",
]
@@ -818,7 +818,7 @@
}
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -4294,7 +4294,6 @@ static_library("ui") {
@@ -4065,7 +4065,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",
@@ -876,7 +876,7 @@
#include "chrome/browser/download/download_history.h"
#include "chrome/browser/download/download_item_model.h"
#include "chrome/browser/download/download_item_warning_data.h"
@@ -695,12 +694,6 @@ void DownloadsDOMHandler::RemoveDownload
@@ -687,12 +686,6 @@ void DownloadsDOMHandler::RemoveDownload
IdSet ids;
for (download::DownloadItem* download : to_remove) {
@@ -901,7 +901,7 @@
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -281,64 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont
@@ -289,64 +289,6 @@ CreateHttpsOnlyModePage(content::WebCont
/*use_new_interstitial=*/IsNewHttpsFirstModeInterstitialEnabled());
}
@@ -966,8 +966,8 @@
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
content::WebContents* web_contents) {
const GURL kRequestUrl("https://enterprise-block.example.net");
@@ -349,35 +291,6 @@ std::unique_ptr<EnterpriseBlockPage> Cre
kRequestUrl));
@@ -367,35 +309,6 @@ std::unique_ptr<ManagedProfileRequiredPa
kRequestUrl));
}
-std::unique_ptr<EnterpriseWarnPage> CreateEnterpriseWarnPage(
@@ -1000,9 +1000,9 @@
-}
-
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
std::unique_ptr<SupervisedUserVerificationPage>
CreateSupervisedUserVerificationPage(content::WebContents* web_contents,
@@ -415,61 +328,6 @@ CreateSupervisedUserVerificationPageForB
std::unique_ptr<SupervisedUserVerificationPageForYouTube>
CreateSupervisedUserVerificationPageForYouTube(
@@ -432,61 +345,6 @@ CreateSupervisedUserVerificationPageForB
}
#endif
@@ -1064,7 +1064,7 @@
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
content::WebContents* web_contents) {
@@ -576,12 +434,8 @@ void InterstitialHTMLSource::StartDataRe
@@ -593,12 +451,8 @@ void InterstitialHTMLSource::StartDataRe
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -1077,7 +1077,7 @@
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -611,12 +465,7 @@ void InterstitialHTMLSource::StartDataRe
@@ -630,12 +484,7 @@ void InterstitialHTMLSource::StartDataRe
#endif
}
@@ -1093,17 +1093,17 @@
html = interstitial_delegate.get()->GetHTMLContents();
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -109,7 +109,6 @@
@@ -111,7 +111,6 @@
#include "components/pdf/common/pdf_util.h"
#include "components/permissions/features.h"
#include "components/safe_browsing/buildflags.h"
-#include "components/safe_browsing/content/renderer/threat_dom_details.h"
#include "components/sampling_profiler/process_type.h"
#include "components/sampling_profiler/thread_profiler.h"
#include "components/security_interstitials/content/renderer/security_interstitial_page_controller_delegate_impl.h"
#include "components/spellcheck/spellcheck_buildflags.h"
@@ -473,12 +472,8 @@ void ChromeContentRendererClient::Render
subresource_filter_ruleset_dealer_ =
std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
@@ -483,12 +482,8 @@ void ChromeContentRendererClient::Render
thread->AddObserver(fingerprinting_protection_ruleset_dealer_.get());
}
- phishing_model_setter_ =
- std::make_unique<safe_browsing::PhishingModelSetterImpl>();

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
+++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
@@ -32,7 +32,6 @@ namespace extensions {
@@ -29,7 +29,6 @@ namespace extensions {
bool IsComponentExtensionAllowlisted(const std::string& extension_id) {
constexpr auto kAllowed = base::MakeFixedFlatSet<std::string_view>({
@@ -10,7 +10,7 @@
extension_misc::kAssessmentAssistantExtensionId,
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -410,11 +410,6 @@ void ComponentLoader::AddWebStoreApp() {
@@ -409,11 +409,6 @@ void ComponentLoader::AddWebStoreApp() {
return;
}
#endif
@@ -21,10 +21,10 @@
- l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION));
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
--- a/chrome/browser/extensions/external_component_loader.cc
+++ b/chrome/browser/extensions/external_component_loader.cc
@@ -37,9 +37,6 @@ ExternalComponentLoader::~ExternalCompon
@@ -34,9 +34,6 @@ ExternalComponentLoader::~ExternalCompon
void ExternalComponentLoader::StartLoading() {
auto prefs = base::Value::Dict();

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
@@ -108,7 +108,7 @@ base::TimeDelta Configurator::UpdateDela
@@ -111,7 +111,7 @@ base::TimeDelta Configurator::UpdateDela
std::vector<GURL> Configurator::UpdateUrl() const {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);

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

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

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

@@ -249,7 +249,7 @@ by default.
--- a/chromeos/ash/components/geolocation/simple_geolocation_provider.h
+++ b/chromeos/ash/components/geolocation/simple_geolocation_provider.h
@@ -91,7 +91,7 @@ class COMPONENT_EXPORT(CHROMEOS_ASH_COMP
@@ -101,7 +101,7 @@ class COMPONENT_EXPORT(CHROMEOS_ASH_COMP
private:
static constexpr char kGeolocationProviderUrl[] =
@@ -260,7 +260,7 @@ by default.
explicit SimpleGeolocationProvider(
--- a/components/drive/service/drive_api_service.cc
+++ b/components/drive/service/drive_api_service.cc
@@ -77,9 +77,9 @@ namespace drive {
@@ -79,9 +79,9 @@ namespace drive {
namespace {
// OAuth2 scopes for Drive API.
@@ -315,7 +315,7 @@ by default.
"https://history.google.com/history/api/lookup?client=audio";
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -69,7 +69,7 @@ const int ClientSideDetectionService::kN
@@ -68,7 +68,7 @@ const int ClientSideDetectionService::kN
const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30;
const char ClientSideDetectionService::kClientReportPhishingUrl[] =

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

@@ -56,10 +56,10 @@ 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
@@ -372,7 +372,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
@@ -373,7 +373,7 @@ SafeBrowsingUIManager* SafeBrowsingServi
}
void SafeBrowsingService::RegisterAllDelayedAnalysis() {
void SafeBrowsingServiceImpl::RegisterAllDelayedAnalysis() {
-#if BUILDFLAG(FULL_SAFE_BROWSING)
+#if 0
RegisterBinaryIntegrityAnalysis();

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

@@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -277,6 +277,10 @@ void ClientSideDetectionService::StartCl
@@ -265,6 +265,10 @@ void ClientSideDetectionService::StartCl
return;
}
@@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).
std::string request_data;
request->SerializeToString(&request_data);
@@ -357,6 +361,7 @@ void ClientSideDetectionService::StartCl
@@ -347,6 +351,7 @@ void ClientSideDetectionService::StartCl
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIInfoSingleton::GetInstance()),
std::move(request), access_token));

12
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
@@ -597,7 +597,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -572,7 +572,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) ||
@@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -854,6 +854,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -860,6 +860,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterWebSafeScheme(url::kWssScheme);
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kDataScheme);
@@ -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
@@ -1048,6 +1048,8 @@ component("net") {
@@ -1053,6 +1053,8 @@ component("net") {
"url_request/referrer_policy.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
@@ -142,7 +142,7 @@
+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -13,6 +13,7 @@
@@ -14,6 +14,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/rand_util.h"
@@ -150,7 +150,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
@@ -52,6 +53,7 @@
@@ -53,6 +54,7 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -158,7 +158,7 @@
namespace net {
@@ -619,6 +621,12 @@ URLRequest::URLRequest(base::PassKey<URL
@@ -637,6 +639,12 @@ URLRequest::URLRequest(base::PassKey<URL
// Sanity check out environment.
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());

2
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
@@ -2757,24 +2757,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2729,24 +2729,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}

9
patches/core/ungoogled-chromium/disable-domain-reliability.patch
View File

@@ -117,7 +117,7 @@
def quote_and_wrap_text(text, width=79, prefix=' "', suffix='"'):
--- a/components/domain_reliability/google_configs.cc
+++ b/components/domain_reliability/google_configs.cc
@@ -11,548 +11,6 @@
@@ -11,551 +11,6 @@
namespace domain_reliability {
@@ -417,6 +417,7 @@
- {"cloudendpointsapis.com", true, false, false},
- {"dartmotif.com", true, false, false},
- {"dartsearch.net", true, false, false},
- {"dev.via.google", true, false, false},
- {"doubleclick.com", true, false, false},
- {"doubleclick.ne.jp", true, false, false},
- {"doubleclick.net", true, false, false},
@@ -461,8 +462,10 @@
- {"gvt3.com", true, false, false},
- {"gvt9.com", true, false, false},
- {"picasa.com", true, false, false},
- {"prod.via.google", true, false, false},
- {"recaptcha.net", true, false, false},
- {"stackdriver.com", true, false, false},
- {"staging.via.google", true, false, false},
- {"waze.com", true, false, false},
- {"withgoogle.com", true, false, false},
- {"youtu.be", true, false, false},
@@ -666,7 +669,7 @@
std::unique_ptr<const DomainReliabilityConfig> MaybeGetGoogleConfig(
const std::string& hostname) {
bool is_www_subdomain =
@@ -562,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
@@ -565,23 +20,6 @@ std::unique_ptr<const DomainReliabilityC
std::unique_ptr<const DomainReliabilityConfig> config;
std::unique_ptr<const DomainReliabilityConfig> superdomain_config;
@@ -690,7 +693,7 @@
if (config) {
DCHECK(config->origin.host() == hostname);
return config;
@@ -597,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
@@ -600,11 +38,6 @@ std::vector<std::unique_ptr<const Domain
GetAllGoogleConfigsForTesting() {
std::vector<std::unique_ptr<const DomainReliabilityConfig>> configs_out;

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

@@ -3,7 +3,7 @@
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -264,61 +264,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -294,61 +294,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
network::mojom::CredentialsMode credentials_mode,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";

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

@@ -2,7 +2,7 @@
--- a/chrome/browser/ui/webui/suggest_internals/suggest_internals_handler.cc
+++ b/chrome/browser/ui/webui/suggest_internals/suggest_internals_handler.cc
@@ -56,9 +56,6 @@ void SuggestInternalsHandler::OnSuggestR
@@ -66,9 +66,6 @@ void SuggestInternalsHandler::OnSuggestR
suggest_internals::mojom::Request::New();
mojom_request->id = request_id;
mojom_request->url = request->url;
@@ -25,7 +25,7 @@
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
#include "chrome/common/bound_session_request_throttled_handler.h"
#include "net/cookies/cookie_util.h"
@@ -149,71 +145,6 @@ void GoogleURLLoaderThrottle::DetachFrom
@@ -171,71 +167,6 @@ void GoogleURLLoaderThrottle::DetachFrom
void GoogleURLLoaderThrottle::WillStartRequest(
network::ResourceRequest* request,
bool* defer) {
@@ -97,7 +97,7 @@
}
void GoogleURLLoaderThrottle::WillRedirectRequest(
@@ -223,96 +154,12 @@ void GoogleURLLoaderThrottle::WillRedire
@@ -245,97 +176,12 @@ void GoogleURLLoaderThrottle::WillRedire
std::vector<std::string>* to_be_removed_headers,
net::HttpRequestHeaders* modified_headers,
net::HttpRequestHeaders* modified_cors_exempt_headers) {
@@ -163,7 +163,8 @@
-#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
- if (is_covered_by_bound_session_) {
- RecordBoundSessionStatusMetrics(is_deferred_for_bound_session_,
- is_main_frame_navigation_);
- is_main_frame_navigation_,
- /*is_request_succeeded=*/true);
- }
- if (deferred_request_resume_trigger_) {
- UMA_HISTOGRAM_ENUMERATION(
@@ -496,7 +497,7 @@
--- a/components/page_load_metrics/browser/page_load_metrics_util.cc
+++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
@@ -284,9 +284,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
@@ -285,9 +285,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
}
bool IsGoogleSearchHostname(const GURL& url) {
@@ -550,7 +551,7 @@
bool IsGoogleHostname(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -590,11 +590,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -612,11 +612,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
@@ -674,7 +675,7 @@
} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -849,7 +849,7 @@ void PrefetchContainer::AddRedirectHop(c
@@ -960,7 +960,7 @@ void PrefetchContainer::AddRedirectHop(c
// some which are added by throttles). These aren't yet supported for
// prefetch, including browsing topics and client hints.
net::HttpRequestHeaders updated_headers;
@@ -685,7 +686,7 @@
--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -493,28 +493,6 @@ bool HasGoogleHost(const GURL& url) {
@@ -511,28 +511,6 @@ bool HasGoogleHost(const GURL& url) {
}
bool IsGoogleHost(std::string_view host) {

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

@@ -7,7 +7,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -394,7 +394,6 @@ if (!is_android && !is_mac) {
@@ -374,7 +374,6 @@ if (!is_android && !is_mac) {
}
data_deps += [

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

@@ -11,7 +11,7 @@
"AttributionAggregatableDebugReporting",
--- a/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
+++ b/components/privacy_sandbox/privacy_sandbox_settings_impl.cc
@@ -127,7 +127,7 @@ std::set<browsing_topics::Topic> GetTopi
@@ -129,7 +129,7 @@ std::set<browsing_topics::Topic> GetTopi
// static
bool PrivacySandboxSettingsImpl::IsAllowed(Status status) {
@@ -20,7 +20,7 @@
}
// static
@@ -822,7 +822,7 @@ void PrivacySandboxSettingsImpl::SetTopi
@@ -851,7 +851,7 @@ void PrivacySandboxSettingsImpl::SetTopi
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
@@ -29,7 +29,7 @@
}
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
@@ -891,11 +891,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
@@ -937,11 +937,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
return Status::kIncognitoProfile;
}

2
patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
View File

@@ -116,7 +116,7 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -113,7 +113,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -111,7 +111,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);

60
patches/core/ungoogled-chromium/extensions-manifestv2.patch
View File

@@ -8,7 +8,7 @@
#include "chrome/browser/extensions/menu_manager_factory.h"
#include "chrome/browser/extensions/permissions/permissions_updater.h"
#include "chrome/browser/extensions/plugin_manager.h"
@@ -48,7 +47,6 @@ void EnsureChromeBrowserContextKeyedServ
@@ -49,7 +48,6 @@ void EnsureChromeBrowserContextKeyedServ
extensions::IncognitoConnectability::EnsureFactoryBuilt();
extensions::InstallTrackerFactory::GetInstance();
extensions::InstallVerifierFactory::GetInstance();
@@ -18,7 +18,7 @@
#if BUILDFLAG(ENABLE_PLUGINS)
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -287,31 +287,7 @@ bool ExtensionManagement::IsAllowedManif
@@ -310,31 +310,7 @@ bool ExtensionManagement::IsAllowedManif
int manifest_version,
const std::string& extension_id,
Manifest::Type manifest_type) {
@@ -50,7 +50,7 @@
}
bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
@@ -332,26 +308,8 @@ bool ExtensionManagement::IsExemptFromMV
@@ -355,26 +331,8 @@ bool ExtensionManagement::IsExemptFromMV
return false;
}
@@ -79,12 +79,17 @@
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
@@ -143,17 +143,6 @@ bool ManifestV2ExperimentManagerFactory:
@@ -143,22 +143,6 @@ bool ManifestV2ExperimentManagerFactory:
// Determines the current stage of the MV2 deprecation experiments.
MV2ExperimentStage CalculateCurrentExperimentStage() {
- // Return the "highest" stage that is currently active for the user.
- if (base::FeatureList::IsEnabled(
- extensions_features::kExtensionManifestV2Unsupported)) {
- return MV2ExperimentStage::kUnsupported;
- }
-
- if (base::FeatureList::IsEnabled(
- extensions_features::kExtensionManifestV2Disabled)) {
- return MV2ExperimentStage::kDisableWithReEnable;
- }
@@ -97,6 +102,37 @@
return MV2ExperimentStage::kNone;
}
@@ -198,30 +182,7 @@ PrefMap GetGlobalNoticeAcknowledgedPrefF
// Returns true if legacy extensions should be disabled, looking at both
// experiment stage and global state.
bool ShouldDisableLegacyExtensions(MV2ExperimentStage stage) {
- if (g_allow_mv2_for_testing) {
- // We allow legacy MV2 extensions for testing purposes.
- return false;
- }
-
- if (base::FeatureList::IsEnabled(
- extensions_features::kAllowLegacyMV2Extensions)) {
- // The user explicitly set the flag to allow legacy MV2 extensions. It's
- // important we retain this functionality so that developers of MV2
- // extensions used by enterprises can continue developing (and testing)
- // them for as long as the ExtensionManifestV2Availability enterprise policy
- // is supported.
return false;
- }
-
- // Check the experiment stage to determine if extensions should be disabled.
- switch (stage) {
- case MV2ExperimentStage::kNone:
- case MV2ExperimentStage::kWarning:
- return false;
- case MV2ExperimentStage::kDisableWithReEnable:
- case MV2ExperimentStage::kUnsupported:
- return true;
- }
}
// Returns true if the user is allowed to re-enable disabled extensions in the
--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -471,9 +471,9 @@ content::WebUIDataSource* CreateAndAddEx
@@ -111,3 +147,19 @@
// MV2 deprecation.
auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -95,13 +95,6 @@ bool IsManifestSupported(int manifest_ve
// Supported versions are always safe.
if (manifest_version >= kMinimumSupportedManifestVersion &&
manifest_version <= kMaximumSupportedManifestVersion) {
- // Emit a warning for unpacked extensions on Manifest V2 warning that
- // MV2 is deprecated.
- if (type == Manifest::TYPE_EXTENSION && manifest_version == 2 &&
- Manifest::IsUnpackedLocation(location) &&
- !g_silence_deprecated_manifest_version_warnings) {
- *warning = errors::kManifestV2IsDeprecatedWarning;
- }
return true;
}

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

@@ -3,7 +3,7 @@
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -395,7 +395,6 @@ if (!is_android && !is_mac) {
@@ -375,7 +375,6 @@ if (!is_android && !is_mac) {
data_deps += [
"//chrome/browser/resources/media/mei_preload:component",
@@ -11,7 +11,7 @@
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -964,8 +963,6 @@ if (is_win) {
@@ -944,8 +943,6 @@ if (is_win) {
bundle_data("chrome_framework_resources") {
sources = [
@@ -22,7 +22,7 @@
# from disk image and Keystone promotion (if so enabled). It
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -774,10 +774,6 @@ static_library("browser") {
@@ -759,10 +759,6 @@ static_library("browser") {
"navigation_predictor/navigation_predictor_metrics_document_data.h",
"navigation_predictor/navigation_predictor_preconnect_client.cc",
"navigation_predictor/navigation_predictor_preconnect_client.h",
@@ -30,21 +30,10 @@
- "navigation_predictor/preloading_model_keyed_service.h",
- "navigation_predictor/preloading_model_keyed_service_factory.cc",
- "navigation_predictor/preloading_model_keyed_service_factory.h",
"navigation_predictor/search_engine_preconnector.cc",
"navigation_predictor/search_engine_preconnector.h",
"net/cert_verifier_service_time_updater.cc",
@@ -897,10 +893,6 @@ static_library("browser") {
"optimization_guide/chrome_prediction_model_store.h",
"optimization_guide/model_execution/chrome_on_device_model_service_controller.cc",
"optimization_guide/model_execution/chrome_on_device_model_service_controller.h",
- "optimization_guide/model_validator_keyed_service.cc",
- "optimization_guide/model_validator_keyed_service.h",
- "optimization_guide/model_validator_keyed_service_factory.cc",
- "optimization_guide/model_validator_keyed_service_factory.h",
"optimization_guide/optimization_guide_internals_ui.cc",
"optimization_guide/optimization_guide_internals_ui.h",
"optimization_guide/optimization_guide_keyed_service.cc",
@@ -3477,10 +3469,6 @@ static_library("browser") {
"net/cert_verifier_service_time_updater.h",
"net/chrome_mojo_proxy_resolver_factory.cc",
@@ -3487,10 +3483,6 @@ static_library("browser") {
} else {
#!is_android
sources += [
@@ -55,7 +44,7 @@
"accessibility/caption_bubble_context_browser.h",
"accessibility/embedded_a11y_extension_loader.cc",
"accessibility/embedded_a11y_extension_loader.h",
@@ -4241,10 +4229,6 @@ static_library("browser") {
@@ -4228,10 +4220,6 @@ static_library("browser") {
"//chrome/browser/on_device_translation:prefs",
"//chrome/browser/policy:path_parser",
"//chrome/browser/resources:component_extension_resources",
@@ -66,7 +55,7 @@
"//chrome/browser/search/background",
"//chrome/browser/smart_card",
"//chrome/browser/task_manager",
@@ -4340,9 +4324,6 @@ static_library("browser") {
@@ -4355,9 +4343,6 @@ static_library("browser") {
"//components/webauthn/core/browser:passkey_model",
"//services/device/public/cpp/bluetooth",
"//services/device/public/cpp/hid",
@@ -76,7 +65,7 @@
"//third_party/crashpad/crashpad/client:common",
"//third_party/zxcvbn-cpp",
"//ui/views",
@@ -4399,8 +4380,6 @@ static_library("browser") {
@@ -4446,8 +4431,6 @@ static_library("browser") {
#!is_android
if (!is_chromeos) {
sources += [
@@ -85,7 +74,7 @@
"device_notifications/device_status_icon_renderer.cc",
"device_notifications/device_status_icon_renderer.h",
"external_protocol/auto_launch_protocols_policy_handler.cc",
@@ -4417,8 +4396,6 @@ static_library("browser") {
@@ -4464,8 +4447,6 @@ static_library("browser") {
"policy/chrome_browser_cloud_management_register_watcher.h",
"policy/file_selection_dialogs_policy_handler.cc",
"policy/file_selection_dialogs_policy_handler.h",
@@ -94,15 +83,15 @@
"usb/usb_status_icon.cc",
"usb/usb_status_icon.h",
]
@@ -5121,7 +5098,6 @@ static_library("browser") {
@@ -5189,7 +5170,6 @@ static_library("browser") {
"//chrome/browser/policy:onc",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/resources:app_icon_resources",
"//chrome/browser/scalable_iph:scalable_iph_factory",
- "//chrome/browser/screen_ai:screen_ai_dlc_installer",
"//chrome/browser/support_tool/ash",
"//chrome/browser/ui/ash",
"//chrome/browser/ui/ash/accelerator",
@@ -5338,7 +5314,6 @@ static_library("browser") {
"//chrome/browser/ui/ash/accessibility",
@@ -5411,7 +5391,6 @@ static_library("browser") {
"//components/webapk:proto",
"//device/vr/public/mojom:isolated_xr_service",
"//remoting/host/chromeos:features",
@@ -110,7 +99,7 @@
"//third_party/nearby:rpc_resources_proto",
"//third_party/nearby:wire_format_proto",
"//ui/chromeos",
@@ -7934,22 +7909,6 @@ static_library("browser") {
@@ -8013,22 +7992,6 @@ static_library("browser") {
}
}
@@ -135,7 +124,7 @@
sources += [
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -245,12 +245,10 @@
@@ -246,12 +246,10 @@
#if BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/chromeos/extensions/telemetry/chromeos_telemetry_extensions_browser_api_provider.h"
#include "chrome/browser/hid/hid_pinned_notification.h"
@@ -148,7 +137,7 @@
#include "chrome/browser/usb/usb_status_icon.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
#endif
@@ -1330,9 +1328,6 @@ void BrowserProcessImpl::PreMainMessageL
@@ -1331,9 +1329,6 @@ void BrowserProcessImpl::PreMainMessageL
soda_installer_impl_ = std::make_unique<speech::SodaInstallerImplChromeOS>();
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -182,16 +171,16 @@
std::unique_ptr<BrowserProcessPlatformPart> platform_part_;
--- a/chrome/browser/chrome_browser_interface_binders.cc
+++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -223,8 +223,6 @@
@@ -225,8 +225,6 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS)
#include "chrome/browser/companion/visual_query/visual_query_suggestions_service_factory.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/ui/web_applications/sub_apps_service_impl.h"
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
@@ -858,38 +856,6 @@ void BindMediaFoundationPreferences(
@@ -864,27 +862,6 @@ void BindMediaFoundationPreferences(
}
#endif // BUILDFLAG(IS_WIN)
@@ -215,31 +204,14 @@
- frame_host->GetProcess()->GetBrowserContext())
- ->BindMainContentExtractor(std::move(receiver));
-}
-
-void BindVisualSuggestionsModelProvider(
- content::RenderFrameHost* frame_host,
- mojo::PendingReceiver<
- companion::visual_query::mojom::VisualSuggestionsModelProvider>
- receiver) {
- companion::visual_query::VisualQuerySuggestionsServiceFactory::GetForProfile(
- Profile::FromBrowserContext(
- frame_host->GetProcess()->GetBrowserContext()))
- ->BindModelReceiver(std::move(receiver));
-}
-#endif
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// A helper class to register ChromeOS Apps API binders. This includes the logic
@@ -1093,21 +1059,6 @@ void PopulateChromeFrameBinders(
@@ -1088,15 +1065,6 @@ void PopulateChromeFrameBinders(
base::BindRepeating(&web_app::SubAppsServiceImpl::CreateIfAllowed));
}
- if (companion::visual_query::features::
- IsVisualQuerySuggestionsAgentEnabled()) {
- map->Add<companion::visual_query::mojom::VisualSuggestionsModelProvider>(
- base::BindRepeating(&BindVisualSuggestionsModelProvider));
- }
-
- if (features::IsPdfOcrEnabled()) {
- map->Add<screen_ai::mojom::ScreenAIAnnotator>(
- base::BindRepeating(&BindScreenAIAnnotator));
@@ -254,7 +226,7 @@
#if BUILDFLAG(IS_WIN)
--- a/chrome/browser/component_updater/registration.cc
+++ b/chrome/browser/component_updater/registration.cc
@@ -68,8 +68,6 @@
@@ -71,8 +71,6 @@
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.h"
@@ -263,7 +235,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if !BUILDFLAG(IS_ANDROID)
@@ -208,9 +206,6 @@ void RegisterComponentsForUpdate() {
@@ -222,9 +220,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
@@ -386,7 +358,7 @@
void NavigationPredictor::SetModelScoreCallbackForTesting(
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1825,9 +1825,6 @@ void RegisterLocalState(PrefRegistrySimp
@@ -1900,9 +1900,6 @@ void RegisterLocalState(PrefRegistrySimp
DeviceOAuth2TokenStoreDesktop::RegisterPrefs(registry);
#endif
@@ -396,9 +368,19 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
PlatformAuthPolicyObserver::RegisterPrefs(registry);
--- a/chrome/browser/profiles/BUILD.gn
+++ b/chrome/browser/profiles/BUILD.gn
@@ -359,7 +359,6 @@ source_set("profiles_extra_parts_impl")
"//chrome/browser/feedback",
"//chrome/browser/hid",
"//chrome/browser/media/router/discovery/access_code:access_code_sink_service",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
"//chrome/browser/search",
"//chrome/browser/search/background",
"//chrome/browser/search_engine_choice",
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -100,7 +100,6 @@
@@ -102,7 +102,6 @@
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
#include "chrome/browser/metrics/variations/google_groups_manager_factory.h"
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
@@ -406,7 +388,7 @@
#include "chrome/browser/net/dns_probe_service_factory.h"
#include "chrome/browser/net/profile_network_context_service_factory.h"
#include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h"
@@ -502,7 +501,6 @@
@@ -493,7 +492,6 @@
#include "chrome/browser/new_tab_page/promos/promo_service_factory.h"
#include "chrome/browser/payments/payment_request_display_manager_factory.h"
#include "chrome/browser/privacy_sandbox/privacy_sandbox_survey_desktop_controller_factory.h"
@@ -414,15 +396,15 @@
#include "chrome/browser/search/background/ntp_background_service_factory.h"
#include "chrome/browser/search/background/ntp_custom_background_service_factory.h"
#include "chrome/browser/serial/serial_chooser_context_factory.h"
@@ -1000,7 +998,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -962,7 +960,6 @@ void ChromeBrowserMainExtraPartsProfiles
metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
#endif
NavigationPredictorKeyedServiceFactory::GetInstance();
- PreloadingModelKeyedServiceFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS)
NearbySharingServiceFactory::GetInstance();
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
@@ -1049,9 +1046,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1011,9 +1008,6 @@ void ChromeBrowserMainExtraPartsProfiles
OneTimePermissionsTrackerFactory::GetInstance();
#endif
OpenerHeuristicServiceFactory::GetInstance();
@@ -432,7 +414,7 @@
OptimizationGuideKeyedServiceFactory::GetInstance();
OriginKeyedPermissionActionServiceFactory::GetInstance();
OriginTrialsFactory::GetInstance();
@@ -1204,13 +1198,6 @@ void ChromeBrowserMainExtraPartsProfiles
@@ -1158,13 +1152,6 @@ void ChromeBrowserMainExtraPartsProfiles
#else
SafetyHubMenuNotificationServiceFactory::GetInstance();
SafetyHubHatsServiceFactory::GetInstance();
@@ -444,11 +426,11 @@
-#endif // BUILDFLAG(ENABLE_PDF)
- screen_ai::ScreenAIServiceRouterFactory::EnsureFactoryBuilt();
#endif
SCTReportingServiceFactory::GetInstance();
search_engines::SearchEngineChoiceServiceFactory::GetInstance();
#if BUILDFLAG(IS_CHROMEOS)
if (ash::features::IsScannerEnabled()) {
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -856,18 +856,6 @@ void ProfileImpl::DoFinalInit(CreateMode
@@ -826,26 +826,6 @@ void ProfileImpl::DoFinalInit(CreateMode
// The password settings service needs to start listening to settings
// changes from Google Mobile Services, as early as possible.
PasswordManagerSettingsServiceFactory::GetForProfile(this);
@@ -456,8 +438,16 @@
-
-#if BUILDFLAG(ENABLE_PDF)
- if (features::IsPdfOcrEnabled()) {
- bool pcf_ocr_may_be_needed = true;
-#if BUILDFLAG(IS_CHROMEOS)
- // `PdfOcrControllerFactory` is not needed in the not-signed-in profile of
- // ChromeOS as no user navigation to PDFs is possible there.
- pcf_ocr_may_be_needed = IsSignedIn();
-#endif
- // Create the PDF OCR controller so that it can self-activate as needed.
- screen_ai::PdfOcrControllerFactory::GetForProfile(this);
- if (pcf_ocr_may_be_needed) {
- screen_ai::PdfOcrControllerFactory::GetForProfile(this);
- }
- }
-#endif // BUILDFLAG(ENABLE_PDF)
-
@@ -477,7 +467,7 @@
#include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/profiles/delete_profile_helper.h"
@@ -1541,9 +1540,6 @@ void ProfileManager::DoFinalInitForServi
@@ -1495,9 +1494,6 @@ void ProfileManager::DoFinalInitForServi
// Ensure NavigationPredictorKeyedService is started.
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
@@ -499,23 +489,23 @@
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1945,8 +1945,6 @@ static_library("ui") {
"//chrome/browser/new_tab_page/chrome_colors",
@@ -1728,8 +1728,6 @@ static_library("ui") {
"//chrome/browser/reading_list",
"//chrome/browser/safe_browsing",
"//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/screen_ai:screen_ai_install_state",
- "//chrome/browser/screen_ai:screen_ai_service_router_factory",
"//chrome/browser/smart_card:smart_card",
"//chrome/browser/tab_group_sync:utils",
"//chrome/browser/task_manager:impl",
"//chrome/browser/themes",
"//chrome/browser/ui/apps",
@@ -2497,7 +2495,6 @@ static_library("ui") {
@@ -2395,7 +2393,6 @@ static_library("ui") {
"//chrome/browser/nearby_sharing/logging:util",
"//chrome/browser/policy:onc",
"//chrome/browser/push_notification:push_notification",
"//chrome/browser/scalable_iph:scalable_iph_factory",
- "//chrome/browser/screen_ai/public:optical_character_recognizer",
"//chrome/browser/ui/ash",
"//chrome/browser/ui/ash/accessibility",
"//chrome/browser/ui/ash/annotator",
"//chrome/browser/ui/ash/app_access",
"//chrome/browser/ui/ash/arc",
--- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
+++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
@@ -36,11 +36,6 @@ void AccessibilityMainHandler::RegisterM
@@ -618,10 +608,10 @@
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router.h"
-#include "chrome/browser/screen_ai/screen_ai_service_router_factory.h"
#include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -320,19 +318,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
@@ -328,19 +326,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
prefs_lang = language::ExtractBaseLanguage(prefs_lang);
SetDefaultLanguageCode(prefs_lang);
@@ -641,7 +631,7 @@
// Enable accessibility for the top level render frame and all descendants.
// This causes AXTreeSerializer to reset and send accessibility events of
@@ -722,9 +707,6 @@ void ReadAnythingUntrustedPageHandler::S
@@ -729,9 +714,6 @@ void ReadAnythingUntrustedPageHandler::S
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
}
}
@@ -653,7 +643,7 @@
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -383,18 +383,6 @@ static_library("renderer") {
@@ -384,18 +384,6 @@ static_library("renderer") {
]
} else {
sources += [
@@ -672,7 +662,7 @@
"media/chrome_speech_recognition_client.cc",
"media/chrome_speech_recognition_client.h",
"searchbox/searchbox.cc",
@@ -408,7 +396,6 @@ static_library("renderer") {
@@ -409,7 +397,6 @@ static_library("renderer") {
"//components/crx_file",
"//components/trusted_vault",
"//services/screen_ai/buildflags",
@@ -682,7 +672,7 @@
]
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -69,7 +69,6 @@
@@ -68,7 +68,6 @@
#include "url/gurl.h"
#if !BUILDFLAG(IS_ANDROID)
@@ -690,7 +680,7 @@
#include "chrome/renderer/searchbox/searchbox_extension.h"
#endif // !BUILDFLAG(IS_ANDROID)
@@ -320,21 +319,6 @@ void ChromeRenderFrameObserver::DidCommi
@@ -316,21 +315,6 @@ void ChromeRenderFrameObserver::DidCommi
}
void ChromeRenderFrameObserver::DidClearWindowObject() {
@@ -714,7 +704,7 @@
void ChromeRenderFrameObserver::DidMeaningfulLayout(
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1959,9 +1959,6 @@ if (!is_android) {
@@ -1922,9 +1922,6 @@ if (!is_android) {
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/safe_browsing:advanced_protection",
"//chrome/browser/safe_browsing:verdict_cache_manager_factory",
@@ -724,7 +714,7 @@
"//chrome/browser/search",
"//chrome/browser/search_engines",
"//chrome/browser/segmentation_platform:test_utils",
@@ -2334,9 +2331,6 @@ if (!is_android) {
@@ -2316,9 +2313,6 @@ if (!is_android) {
"//services/network/public/proto:sct_audit_report_proto",
"//services/preferences/public/cpp",
"//services/preferences/public/cpp/tracked",
@@ -734,7 +724,7 @@
"//services/service_manager/public/cpp",
"//services/strings",
"//services/test/echo/public/mojom",
@@ -8237,7 +8231,6 @@ test("unit_tests") {
@@ -7742,7 +7736,6 @@ test("unit_tests") {
# Non-android deps for "unit_tests" target.
deps += [
@@ -742,7 +732,7 @@
"//chrome:packed_resources_integrity_header",
"//chrome/browser/apps:icon_standardizer",
"//chrome/browser/apps/app_service",
@@ -8367,7 +8360,6 @@ test("unit_tests") {
@@ -7893,7 +7886,6 @@ test("unit_tests") {
"//services/device/public/cpp/bluetooth",
"//services/metrics/public/cpp:ukm_builders",
"//services/network:test_support",
@@ -750,15 +740,14 @@
"//services/video_effects/test:test_support",
"//third_party/crashpad/crashpad/util",
"//third_party/libaddressinput",
@@ -8687,8 +8679,6 @@ test("unit_tests") {
"//chrome/browser/push_notification:test_support",
"//chrome/browser/push_notification/protos:proto",
"//chrome/browser/scalable_iph:scalable_iph_factory",
@@ -8335,7 +8327,6 @@ test("unit_tests") {
"//chrome/browser/nearby_sharing/contacts:unit_tests",
"//chrome/browser/nearby_sharing/local_device_data:unit_tests",
"//chrome/browser/policy:unit_tests",
- "//chrome/browser/screen_ai:unit_tests",
- "//chrome/browser/screen_ai/public:test_support",
"//chrome/browser/support_tool/ash:unit_tests",
"//chrome/browser/task_manager:impl",
"//chrome/browser/ui/ash",
"//chrome/browser/ui/ash:unit_tests",
"//chrome/browser/ui/views/crostini:unit_tests",
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -404,7 +404,7 @@ source_set("lib") {
@@ -824,7 +813,7 @@
#if BUILDFLAG(ENABLE_BROWSER_SPEECH_SERVICE)
--- a/components/omnibox/browser/autocomplete_classifier.cc
+++ b/components/omnibox/browser/autocomplete_classifier.cc
@@ -94,8 +94,6 @@ void AutocompleteClassifier::Classify(
@@ -96,8 +96,6 @@ void AutocompleteClassifier::Classify(
metrics::OmniboxEventProto::PageClassification page_classification,
AutocompleteMatch* match,
GURL* alternate_nav_url) {
@@ -853,6 +842,79 @@
#include "components/strings/grit/components_strings.h"
#include "pdf/accessibility_structs.h"
#include "pdf/pdf_features.h"
--- a/components/pdf/renderer/pdf_view_web_plugin_client.cc
+++ b/components/pdf/renderer/pdf_view_web_plugin_client.cc
@@ -204,34 +204,6 @@ PdfViewWebPluginClient::CreateAssociated
return GetFrame()->CreateAssociatedURLLoader(options);
}
-void PdfViewWebPluginClient::PerformOcr(
- const SkBitmap& image,
- base::OnceCallback<void(screen_ai::mojom::VisualAnnotationPtr)> callback) {
- CHECK(base::FeatureList::IsEnabled(ax::mojom::features::kScreenAIOCREnabled));
-
- if (!screen_ai_annotator_.is_bound()) {
- render_frame_->GetBrowserInterfaceBroker().GetInterface(
- screen_ai_annotator_.BindNewPipeAndPassReceiver());
- screen_ai_annotator_->SetClientType(
- screen_ai::mojom::OcrClientType::kPdfViewer);
- screen_ai_annotator_.set_disconnect_handler(
- base::BindOnce(&PdfViewWebPluginClient::OnOcrDisconnected,
- weak_factory_.GetWeakPtr()));
- }
- screen_ai_annotator_->PerformOcrAndReturnAnnotation(image,
- std::move(callback));
-}
-
-void PdfViewWebPluginClient::SetOcrDisconnectedCallback(
- base::RepeatingClosure callback) {
- ocr_disconnect_callback_ = std::move(callback);
-}
-
-void PdfViewWebPluginClient::OnOcrDisconnected() {
- screen_ai_annotator_.reset();
- CHECK(ocr_disconnect_callback_);
- ocr_disconnect_callback_.Run();
-}
void PdfViewWebPluginClient::UpdateTextInputState() {
// `widget` is null in Print Preview.
--- a/components/pdf/renderer/pdf_view_web_plugin_client.h
+++ b/components/pdf/renderer/pdf_view_web_plugin_client.h
@@ -12,7 +12,6 @@
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/remote.h"
#include "pdf/pdf_view_web_plugin.h"
-#include "services/screen_ai/public/mojom/screen_ai_service.mojom.h"
namespace blink {
class WebLocalFrame;
@@ -87,16 +86,10 @@ class PdfViewWebPluginClient : public ch
chrome_pdf::PdfAccessibilityImageFetcher* image_fetcher,
blink::WebPluginContainer* plugin_element,
bool print_preview) override;
- void PerformOcr(
- const SkBitmap& image,
- base::OnceCallback<void(screen_ai::mojom::VisualAnnotationPtr)> callback)
- override;
- void SetOcrDisconnectedCallback(base::RepeatingClosure callback) override;
private:
blink::WebLocalFrame* GetFrame() const;
- void OnOcrDisconnected();
const raw_ptr<content::RenderFrame> render_frame_;
@@ -105,8 +98,6 @@ class PdfViewWebPluginClient : public ch
raw_ptr<blink::WebPluginContainer> plugin_container_;
- mojo::Remote<screen_ai::mojom::ScreenAIAnnotator> screen_ai_annotator_;
- base::RepeatingClosure ocr_disconnect_callback_;
base::WeakPtrFactory<PdfViewWebPluginClient> weak_factory_{this};
};
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -339,8 +339,6 @@ source_set("unit_tests") {
@@ -866,7 +928,7 @@
fuzzer_test("update_client_protocol_serializer_fuzzer") {
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -805,10 +805,6 @@ if (is_apple) {
@@ -807,10 +807,6 @@ if (is_apple) {
deps = [ "//third_party/icu:icudata" ]
}
@@ -877,6 +939,60 @@
if (v8_use_external_startup_data) {
public_deps += [ "//v8" ]
if (use_v8_context_snapshot) {
--- a/pdf/pdf_view_web_plugin.cc
+++ b/pdf/pdf_view_web_plugin.cc
@@ -1204,11 +1204,6 @@ void PdfViewWebPlugin::DocumentLoadCompl
if (accessibility_state_ == AccessibilityState::kPending)
LoadAccessibility();
- // To avoid delaying page load for searchify, start searchify after document
- // load is completed.
- client_->SetOcrDisconnectedCallback(engine_->GetOcrDisconnectHandler());
- engine_->StartSearchify(
- base::BindRepeating(&Client::PerformOcr, client_->GetWeakPtr()));
if (!full_frame_)
return;
@@ -2061,7 +2056,7 @@ void PdfViewWebPlugin::EnableAccessibili
SkBitmap PdfViewWebPlugin::GetImageForOcr(int32_t page_index,
int32_t page_object_index) {
- return engine_->GetImageForOcr(page_index, page_object_index);
+ return SkBitmap();
}
#if BUILDFLAG(ENABLE_PDF_INK2)
@@ -2641,19 +2636,6 @@ void PdfViewWebPlugin::PrepareAndSetAcce
return;
}
- // Wait for the page to be loaded and searchified before getting accessibility
- // page info.
- // Ensure page is loaded so that it can schedule a searchify operation if
- // needed.
- engine_->GetPage(page_index)->GetPage();
- if (engine_->PageNeedsSearchify(page_index)) {
- base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask(
- FROM_HERE,
- base::BindOnce(&PdfViewWebPlugin::PrepareAndSetAccessibilityPageInfo,
- weak_factory_.GetWeakPtr(), page_index),
- kAccessibilityPageDelay * 10);
- return;
- }
++next_accessibility_page_index_;
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -2617,7 +2617,7 @@ void PDFiumEngine::HandleLongPress(const
SkBitmap PDFiumEngine::GetImageForOcr(int page_index, int image_index) {
DCHECK(PageIndexInBounds(page_index));
- return pages_[page_index]->GetImageForOcr(image_index);
+ return SkBitmap();
}
bool PDFiumEngine::GetPrintScaling() {
--- a/services/passage_embeddings/passage_embeddings_service.cc
+++ b/services/passage_embeddings/passage_embeddings_service.cc
@@ -6,7 +6,6 @@
@@ -935,8 +1051,8 @@
"panels/timeline/components/insights:unittests",
- "panels/timeline/fixtures/traces",
"panels/timeline/overlays:unittests",
"panels/timeline/overlays/components:unittests",
"panels/timeline/track_appenders:unittests",
"panels/utils:unittests",
--- a/third_party/devtools-frontend/src/front_end/models/trace/lantern/core/BUILD.gn
+++ b/third_party/devtools-frontend/src/front_end/models/trace/lantern/core/BUILD.gn
@@ -38,5 +38,4 @@ ts_library("unittests") {

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

2
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"
@@ -2279,6 +2280,7 @@ void RenderViewContextMenu::AppendPageIt
@@ -2282,6 +2283,7 @@ void RenderViewContextMenu::AppendPageIt
}
if (CanTranslate(/*menu_logging=*/true)) {

58
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
@@ -2451,6 +2451,7 @@ static_library("browser") {
@@ -2456,6 +2456,7 @@ static_library("browser") {
"//third_party/libyuv",
"//third_party/metrics_proto",
"//third_party/re2",
@@ -19,7 +19,7 @@
"//third_party/widevine/cdm:headers",
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -177,6 +177,7 @@
@@ -178,6 +178,7 @@
#include "components/translate/core/common/translate_util.h"
#include "components/trusted_vault/features.h"
#include "components/ui_devtools/switches.h"
@@ -62,15 +62,15 @@
#include "components/viz/common/switches.h"
#include "components/viz/host/gpu_client.h"
#include "content/browser/bad_message.h"
@@ -3370,6 +3371,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
+ switches::kFingerprintingClientRectsNoise,
+ switches::kFingerprintingCanvasMeasureTextNoise,
switches::kForceDeviceScaleFactor,
switches::kForceDisplayColorProfile,
switches::kForceGpuMemAvailableMb,
@@ -3348,6 +3349,8 @@ void RenderProcessHostImpl::PropagateBro
switches::kEnableWebGLImageChromium,
switches::kEnableWebGPUDeveloperFeatures,
switches::kFileUrlPathAlias,
+ switches::kFingerprintingClientRectsNoise,
+ switches::kFingerprintingCanvasMeasureTextNoise,
switches::kForceDeviceScaleFactor,
switches::kForceDisplayColorProfile,
switches::kForceGpuMemAvailableMb,
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -105,6 +105,7 @@ target(link_target_type, "child") {
@@ -91,10 +91,10 @@
#include "ui/accessibility/accessibility_features.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/blink/blink_features.h"
@@ -494,6 +495,10 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kEnableWebGPUDeveloperFeatures, true},
{wrf::EnableWebGPUExperimentalFeatures, switches::kEnableUnsafeWebGPU,
@@ -500,6 +501,10 @@ void SetRuntimeFeaturesFromCommandLine(c
true},
{wrf::EnableWebAudioBypassOutputBufferingOptOut,
blink::switches::kWebAudioBypassOutputBufferingOptOut, true},
+ {wrf::EnableFingerprintingClientRectsNoise,
+ switches::kFingerprintingClientRectsNoise, true},
+ {wrf::EnableFingerprintingCanvasMeasureTextNoise,
@@ -116,15 +116,15 @@
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -45,6 +45,7 @@
#include "base/i18n/time_formatting.h"
@@ -41,6 +41,7 @@
#include "base/metrics/histogram_functions.h"
#include "base/not_fatal_until.h"
#include "base/notreached.h"
+#include "base/rand_util.h"
#include "base/ranges/algorithm.h"
#include "base/task/single_thread_task_runner.h"
#include "base/time/time.h"
@@ -861,6 +862,11 @@ Document::Document(const DocumentInit& i
@@ -849,6 +850,11 @@ Document::Document(const DocumentInit& i
TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this),
TRACE_EVENT_FLAG_FLOW_OUT);
DCHECK(agent_);
@@ -136,7 +136,7 @@
if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) &&
features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) {
script_runner_delayer_->Activate();
@@ -978,6 +984,14 @@ const Position Document::PositionAdjuste
@@ -966,6 +972,14 @@ const Position Document::PositionAdjuste
return Position::BeforeNode(*shadow_host);
}
@@ -153,7 +153,7 @@
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
--- a/third_party/blink/renderer/core/dom/document.h
+++ b/third_party/blink/renderer/core/dom/document.h
@@ -548,6 +548,10 @@ class CORE_EXPORT Document : public Cont
@@ -547,6 +547,10 @@ class CORE_EXPORT Document : public Cont
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
}
@@ -164,7 +164,7 @@
AtomicString visibilityState() const;
bool IsPageVisible() const;
bool hidden() const;
@@ -2556,6 +2560,9 @@ class CORE_EXPORT Document : public Cont
@@ -2554,6 +2558,9 @@ class CORE_EXPORT Document : public Cont
base::ElapsedTimer start_time_;
@@ -176,7 +176,7 @@
--- a/third_party/blink/renderer/core/dom/element.cc
+++ b/third_party/blink/renderer/core/dom/element.cc
@@ -2508,6 +2508,11 @@ DOMRectList* Element::getClientRects() {
@@ -2528,6 +2528,11 @@ DOMRectList* Element::getClientRects() {
DCHECK(element_layout_object);
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
*element_layout_object);
@@ -188,7 +188,7 @@
return MakeGarbageCollected<DOMRectList>(quads);
}
@@ -2535,6 +2540,9 @@ gfx::RectF Element::GetBoundingClientRec
@@ -2555,6 +2560,9 @@ gfx::RectF Element::GetBoundingClientRec
DCHECK(element_layout_object);
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
*element_layout_object);
@@ -228,7 +228,7 @@
// TODO(editing-dev): We should make
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.cc
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.cc
@@ -93,6 +93,24 @@ const ShapeResult* ShapeWord(const TextR
@@ -103,6 +103,24 @@ const ShapeResult* ShapeWord(const TextR
}
} // namespace
@@ -255,7 +255,7 @@
const TextBaseline& baseline,
--- a/third_party/blink/renderer/core/html/canvas/text_metrics.h
+++ b/third_party/blink/renderer/core/html/canvas/text_metrics.h
@@ -93,6 +93,8 @@ class CORE_EXPORT TextMetrics final : pu
@@ -101,6 +101,8 @@ class CORE_EXPORT TextMetrics final : pu
float x_position_;
};
@@ -266,7 +266,7 @@
const TextDirection&,
--- 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
@@ -221,6 +221,9 @@ class Isolate;
@@ -223,6 +223,9 @@ class Isolate;
class Value;
} // namespace v8
@@ -276,7 +276,7 @@
namespace blink {
class DOMMatrixInit;
@@ -3592,8 +3595,22 @@ TextMetrics* BaseRenderingContext2D::mea
@@ -3618,8 +3621,22 @@ TextMetrics* BaseRenderingContext2D::mea
const CanvasRenderingContext2DState& state = GetState();
TextDirection direction = ToTextDirection(state.GetDirection(), canvas);
@@ -303,7 +303,7 @@
void BaseRenderingContext2D::SnapshotStateForFilter() {
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1758,6 +1758,7 @@ component("platform") {
@@ -1762,6 +1762,7 @@ component("platform") {
"//components/paint_preview/common",
"//components/search_engines:search_engine_utils",
"//components/translate/core/language_detection:language_detection",
@@ -338,8 +338,8 @@
#include "third_party/blink/renderer/platform/wtf/vector.h"
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1991,6 +1991,12 @@
status: "experimental",
@@ -2013,6 +2013,12 @@
depends_on: ["FindDecomposedInShortText"],
},
{
+ name: "FingerprintingClientRectsNoise",

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

@@ -34,17 +34,17 @@ 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
@@ -3373,6 +3373,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
+ switches::kFingerprintingCanvasImageDataNoise,
switches::kForceDeviceScaleFactor,
switches::kForceDisplayColorProfile,
switches::kForceGpuMemAvailableMb,
@@ -3351,6 +3351,7 @@ void RenderProcessHostImpl::PropagateBro
switches::kFileUrlPathAlias,
switches::kFingerprintingClientRectsNoise,
switches::kFingerprintingCanvasMeasureTextNoise,
+ switches::kFingerprintingCanvasImageDataNoise,
switches::kForceDeviceScaleFactor,
switches::kForceDisplayColorProfile,
switches::kForceGpuMemAvailableMb,
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -499,6 +499,8 @@ void SetRuntimeFeaturesFromCommandLine(c
@@ -505,6 +505,8 @@ void SetRuntimeFeaturesFromCommandLine(c
switches::kFingerprintingClientRectsNoise, true},
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
switches::kFingerprintingCanvasMeasureTextNoise, true},
@@ -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
@@ -2915,6 +2915,9 @@ ImageData* BaseRenderingContext2D::getIm
@@ -2931,6 +2931,9 @@ ImageData* BaseRenderingContext2D::getIm
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
}
@@ -77,7 +77,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
@@ -1707,7 +1707,9 @@ component("platform") {
@@ -1709,7 +1709,9 @@ component("platform") {
"//third_party/blink/renderer:non_test_config",
]
@@ -314,7 +314,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
@@ -1997,6 +1997,9 @@
@@ -2019,6 +2019,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
@@ -2141,6 +2141,7 @@ static_library("browser") {
@@ -2143,6 +2143,7 @@ static_library("browser") {
"//components/net_log",
"//components/network_hints/common:mojo_bindings",
"//components/network_session_configurator/browser",
@@ -64,7 +64,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "base/synchronization/waitable_event.h"
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
@@ -110,6 +112,7 @@
@@ -111,6 +113,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"
@@ -72,7 +72,7 @@ with limited CPU/memory resources and it is disabled by default.
#include "components/network_time/network_time_tracker.h"
#include "components/os_crypt/async/browser/os_crypt_async.h"
#include "components/permissions/permissions_client.h"
@@ -143,6 +146,7 @@
@@ -144,6 +147,7 @@
#include "extensions/common/constants.h"
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -80,7 +80,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"
@@ -404,6 +408,18 @@ void BrowserProcessImpl::Init() {
@@ -405,6 +409,18 @@ void BrowserProcessImpl::Init() {
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
base::BindRepeating(&ApplyMetricsReportingPolicy));
@@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default.
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -2477,6 +2477,10 @@ const char kLogJsConsoleMessagesDescript
@@ -2522,6 +2522,10 @@ const char kLogJsConsoleMessagesDescript
"Enable logging JS console messages in system logs, please note that they "
"may contain PII.";
@@ -114,7 +114,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
@@ -1413,6 +1413,9 @@ extern const char kLocationBarModelOptim
@@ -1426,6 +1426,9 @@ extern const char kLocationBarModelOptim
extern const char kLogJsConsoleMessagesName[];
extern const char kLogJsConsoleMessagesDescription[];

13
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
@@ -1612,7 +1612,7 @@ void ChromeContentBrowserClient::Registe
@@ -1581,7 +1581,7 @@ void ChromeContentBrowserClient::Registe
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -23,7 +23,7 @@
// used for mapping the command-line flags).
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -399,7 +399,7 @@ void ProfileNetworkContextService::Confi
@@ -474,7 +474,7 @@ void ProfileNetworkContextService::Confi
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
@@ -45,7 +45,7 @@
// Enum representing possible values of the Preload Pages opt-in state. These
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -318,7 +318,7 @@ const char Profile::kProfileKey[] = "__P
@@ -308,7 +308,7 @@ const char Profile::kProfileKey[] = "__P
void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
prefs::kSearchSuggestEnabled,
@@ -67,7 +67,7 @@
</cr-dialog>
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -97,7 +97,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -95,7 +95,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
@@ -120,7 +120,7 @@
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -315,14 +315,14 @@ bool HasManuallyFilledFields(const Passw
@@ -319,7 +319,7 @@ bool HasManuallyFilledFields(const Passw
void PasswordManager::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
@@ -128,7 +128,8 @@
+ prefs::kCredentialsEnableService, false,
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
#if BUILDFLAG(IS_IOS)
registry->RegisterBooleanPref(prefs::kCredentialProviderEnabledOnStartup,
// Deprecated pref in profile prefs.
@@ -327,7 +327,7 @@ void PasswordManager::RegisterProfilePre
false);
#endif // BUILDFLAG(IS_IOS)
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
@@ -304,6 +304,12 @@ if (is_linux || is_chromeos) {
@@ -305,6 +305,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/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
@@ -1687,11 +1687,6 @@ int ChromeBrowserMainParts::PreMainMessa
@@ -1680,11 +1680,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/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"
@@ -79,9 +80,12 @@ bool BookmarkTabHelper::ShouldShowBookma
@@ -78,9 +79,12 @@ bool BookmarkTabHelper::ShouldShowBookma
const bool has_saved_tab_groups =
tab_group_service && !tab_group_service->GetAllGroups().empty();

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -147,6 +147,7 @@
@@ -146,6 +146,7 @@
#include "chrome/browser/ui/unload_controller.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/contents_web_view.h"
@@ -8,7 +8,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"
@@ -552,6 +553,7 @@ Browser::Browser(const CreateParams& par
@@ -550,6 +551,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),
@@ -16,7 +16,7 @@
override_bounds_(params.initial_bounds),
initial_show_state_(params.initial_show_state),
initial_workspace_(params.initial_workspace),
@@ -986,20 +988,22 @@ Browser::WarnBeforeClosingResult Browser
@@ -999,20 +1001,22 @@ Browser::WarnBeforeClosingResult Browser
return WarnBeforeClosingResult::kOkToClose;
}
@@ -52,7 +52,7 @@
}
DCHECK(!warn_before_closing_callback_)
@@ -1037,6 +1041,7 @@ bool Browser::TryToCloseWindow(
@@ -1050,6 +1054,7 @@ bool Browser::TryToCloseWindow(
void Browser::ResetTryToCloseWindow() {
cancel_download_confirmation_state_ = NOT_PROMPTED;
@@ -60,7 +60,7 @@
unload_controller_.ResetTryToCloseWindow();
}
@@ -3113,6 +3118,58 @@ bool Browser::CanCloseWithInProgressDown
@@ -3133,6 +3138,58 @@ bool Browser::CanCloseWithInProgressDown
return false;
}
@@ -119,7 +119,7 @@
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
if (cancel_downloads) {
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
@@ -3138,6 +3195,22 @@ void Browser::InProgressDownloadResponse
@@ -3158,6 +3215,22 @@ void Browser::InProgressDownloadResponse
std::move(warn_before_closing_callback_)
.Run(WarnBeforeClosingResult::kDoNotClose);
@@ -152,7 +152,7 @@
#include "chrome/browser/ui/signin/signin_view_controller.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
@@ -1167,12 +1168,17 @@ class Browser : public TabStripModelObse
@@ -1181,12 +1182,17 @@ class Browser : public TabStripModelObse
// Returns true if the window can close, false otherwise.
bool CanCloseWithInProgressDownloads();
@@ -170,7 +170,7 @@
// Called when the user has decided whether to proceed or not with the browser
// closure, in case the cookie migration notice was shown. |proceed_closing|
// is true if the browser can be closed.
@@ -1338,6 +1344,8 @@ class Browser : public TabStripModelObse
@@ -1352,6 +1358,8 @@ class Browser : public TabStripModelObse
// when the browser is closed with in-progress downloads.
CancelDownloadConfirmationState cancel_download_confirmation_state_;

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
@@ -930,10 +930,14 @@ bool HandleNewTabPageLocationOverride(
@@ -937,10 +937,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

@@ -50,7 +50,7 @@
Node* inner_node = event.InnerNode();
--- a/third_party/blink/renderer/core/input/mouse_event_manager.cc
+++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc
@@ -665,8 +665,14 @@ WebInputEventResult MouseEventManager::H
@@ -684,8 +684,14 @@ WebInputEventResult MouseEventManager::H
bool single_click = event.Event().click_count <= 1;

4
patches/extra/ungoogled-chromium/add-flag-for-incognito-themes.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -638,5 +638,7 @@ bool BrowserFrame::RegenerateFrameOnThem
@@ -640,5 +640,7 @@ bool BrowserFrame::RegenerateFrameOnThem
}
bool BrowserFrame::IsIncognitoBrowser() const {
@@ -18,7 +18,7 @@
#include "ui/gfx/color_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -421,7 +422,9 @@ void NTPResourceCache::CreateNewTabIncog
@@ -427,7 +428,9 @@ void NTPResourceCache::CreateNewTabIncog
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
// Colors.

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

@@ -25,7 +25,7 @@
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/renderer/chrome_render_frame_observer.cc
+++ b/chrome/renderer/chrome_render_frame_observer.cc
@@ -255,14 +255,16 @@ void ChromeRenderFrameObserver::DidFinis
@@ -251,14 +251,16 @@ void ChromeRenderFrameObserver::DidFinis
if (frame->Parent() || frame->IsInFencedFrameTree())
return;
@@ -52,7 +52,7 @@
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -21,6 +21,7 @@
@@ -19,6 +19,7 @@
#include "base/base64url.h"
#include "base/check_deref.h"
#include "base/check_is_test.h"
@@ -92,7 +92,7 @@
}
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
@@ -2030,6 +2038,8 @@ SyncDataMap TemplateURLService::CreateGU
@@ -2039,6 +2047,8 @@ SyncDataMap TemplateURLService::CreateGU
}
void TemplateURLService::Init() {
@@ -101,7 +101,7 @@
if (client_)
client_->SetOwner(this);
@@ -2210,6 +2220,9 @@ void TemplateURLService::ChangeToLoadedS
@@ -2219,6 +2229,9 @@ void TemplateURLService::ChangeToLoadedS
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
const std::string& host) const {
@@ -113,7 +113,7 @@
return true;
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -884,6 +884,8 @@ class TemplateURLService final : public
@@ -895,6 +895,8 @@ class TemplateURLService final : public
raw_ref<search_engines::SearchEngineChoiceService>
search_engine_choice_service_;

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

@@ -8,7 +8,7 @@
#include "base/debug/alias.h"
#include "base/functional/bind.h"
#include "base/i18n/rtl.h"
@@ -702,6 +703,8 @@ void Tab::OnGestureEvent(ui::GestureEven
@@ -704,6 +705,8 @@ void Tab::OnGestureEvent(ui::GestureEven
}
std::u16string Tab::GetTooltipText(const gfx::Point& p) const {

2
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
@@ -1422,7 +1422,8 @@ void BrowserCommandController::InitComma
@@ -1424,7 +1424,8 @@ void BrowserCommandController::InitComma
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
normal_window);

10
patches/extra/ungoogled-chromium/add-flag-to-clear-data-on-exit.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/browser_features.cc
+++ b/chrome/browser/browser_features.cc
@@ -450,4 +450,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
@@ -392,4 +392,5 @@ BASE_FEATURE(kRemovalOfIWAsFromTabCaptur
"RemovalOfIWAsFromTabCapture",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -8,10 +8,10 @@
} // namespace features
--- a/chrome/browser/browser_features.h
+++ b/chrome/browser/browser_features.h
@@ -170,6 +170,7 @@ BASE_DECLARE_FEATURE(kReportPakFileInteg
BASE_DECLARE_FEATURE(kRemovalOfIWAsFromTabCapture);
@@ -151,6 +151,7 @@ BASE_DECLARE_FEATURE(kRemovalOfIWAsFromT
// module, e.g.
// //chrome/browser/<foo_module>/features.h
//
+BASE_DECLARE_FEATURE(kClearDataOnExit);
} // namespace features

34
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"
@@ -700,6 +701,10 @@ void TabStripModel::CloseAllTabsInGroup(
@@ -696,6 +697,10 @@ void TabStripModel::CloseAllTabsInGroup(
void TabStripModel::CloseWebContentsAt(int index, uint32_t close_types) {
CHECK(ContainsIndex(index));
@@ -19,7 +19,7 @@
WebContents* contents = GetWebContentsAt(index);
CloseTabs(base::span<WebContents* const>(&contents, 1u), close_types);
}
@@ -1051,11 +1056,15 @@ void TabStripModel::AddTab(std::unique_p
@@ -1047,11 +1052,15 @@ void TabStripModel::AddTab(std::unique_p
}
void TabStripModel::CloseSelectedTabs() {
@@ -38,22 +38,20 @@
TabCloseTypes::CLOSE_CREATE_HISTORICAL_TAB |
TabCloseTypes::CLOSE_USER_GESTURE);
}
@@ -1437,10 +1446,15 @@ void TabStripModel::ExecuteContextMenuCo
}
case CommandCloseTab: {
+ std::vector<int> indices = GetIndicesForCommand(context_index);
+ if (base::CommandLine::ForCurrentProcess()->
+ GetSwitchValueASCII("close-window-with-last-tab") == "never" &&
+ static_cast<int>(indices.size()) == count())
+ delegate()->AddTabAt(GURL(), -1, true);
ReentrancyCheck reentrancy_check(&reentrancy_guard_);
base::RecordAction(UserMetricsAction("TabContextMenu_CloseTab"));
- ExecuteCloseTabsByIndicesCommand(GetIndicesForCommand(context_index));
+ ExecuteCloseTabsByIndicesCommand(indices);
break;
}
@@ -1800,9 +1809,13 @@ TabStripModel::GetGroupsDestroyedFromRem
void TabStripModel::ExecuteCloseTabsByIndices(
base::RepeatingCallback<std::vector<int>()> get_indices_to_close,
uint32_t close_types) {
- ReentrancyCheck reentrancy_check(&reentrancy_guard_);
const std::vector<int> indices_to_close =
std::move(get_indices_to_close).Run();
+ if (base::CommandLine::ForCurrentProcess()->
+ GetSwitchValueASCII("close-window-with-last-tab") == "never" &&
+ static_cast<int>(indices_to_close.size()) == count())
+ delegate()->AddTabAt(GURL(), -1, true);
+ ReentrancyCheck reentrancy_check(&reentrancy_guard_);
CloseTabs(GetWebContentsesByIndices(indices_to_close), close_types);
}
--- a/chrome/browser/ungoogled_flag_choices.h
+++ b/chrome/browser/ungoogled_flag_choices.h

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

@@ -77,7 +77,7 @@
#include "base/containers/contains.h"
#include "base/feature_list.h"
#include "base/functional/bind.h"
@@ -253,6 +254,13 @@ bool ExtensionManagement::IsInstallation
@@ -276,6 +277,13 @@ bool ExtensionManagement::IsInstallation
bool ExtensionManagement::IsOffstoreInstallAllowed(
const GURL& url,
const GURL& referrer_url) const {

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
@@ -1278,6 +1278,8 @@ WindowOpenDisposition NavigationPolicyTo
@@ -1223,6 +1223,8 @@ WindowOpenDisposition NavigationPolicyTo
case blink::kWebNavigationPolicyNewWindow:
return WindowOpenDisposition::NEW_WINDOW;
case blink::kWebNavigationPolicyNewPopup:

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

@@ -16,7 +16,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/feature_engagement/public/event_constants.h"
@@ -535,6 +537,17 @@ void ExtensionsToolbarContainer::AnchorA
@@ -537,6 +539,17 @@ void ExtensionsToolbarContainer::AnchorA
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
anchor_view && anchor_view->GetVisible() ? anchor_view
: GetExtensionsButton());
@@ -34,7 +34,7 @@
widget->Show();
}
@@ -921,6 +934,9 @@ void ExtensionsToolbarContainer::UpdateC
@@ -923,6 +936,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
@@ -2019,6 +2019,10 @@ void BrowserView::ExitFullscreen() {
@@ -2039,6 +2039,10 @@ void BrowserView::ExitFullscreen() {
void BrowserView::UpdateExclusiveAccessBubble(
const ExclusiveAccessBubbleParams& params,
ExclusiveAccessBubbleHideCallback first_hide_callback) {

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
@@ -1079,7 +1079,11 @@ void Tab::UpdateIconVisibility() {
@@ -1117,7 +1117,11 @@ void Tab::UpdateIconVisibility() {
// Close button is shown on active tabs regardless of the size.
showing_close_button_ = true;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -12,7 +12,7 @@
showing_alert_indicator_ =
has_alert_icon && alert_icon_width <= available_width;
@@ -1108,6 +1112,8 @@ void Tab::UpdateIconVisibility() {
@@ -1146,6 +1150,8 @@ void Tab::UpdateIconVisibility() {
!controller_->IsLockedForOnTask() &&
#endif
large_enough_for_close_button;

2
patches/extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
View File

@@ -3,7 +3,7 @@
@@ -128,4 +128,8 @@
"Minimal Referrers",
"Removes all cross-origin referrers and strips same-origin referrers down to the origin. Has lower precedence than remove-cross-origin-referrers. ungoogled-chromium flag.",
kOsAll, FEATURE_VALUE_TYPE(features::kMinimalReferrers)},
kOsAll, FEATURE_VALUE_TYPE(network::features::kMinimalReferrers)},
+ {"reduced-system-info",
+ "Reduced System Info",
+ "Reduces the amount of system information obatainable through headers and javascript, also causes hardwareConcurrency to respond with two cores. ungoogled-chromium flag.",

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

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -494,6 +494,17 @@ void ToolbarView::Init() {
@@ -490,6 +490,17 @@ void ToolbarView::Init() {
browser_->profile()->IsGuestSession() ||
browser_->profile()->IsRegularProfile();
#endif

2
patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4234,10 +4234,12 @@ const FeatureEntry::FeatureVariation
@@ -4237,10 +4237,12 @@ const FeatureEntry::FeatureVariation
#include "chrome/browser/ungoogled_flag_choices.h"
#include "chrome/browser/bromite_flag_choices.h"
#include "chrome/browser/ungoogled_platform_flag_choices.h"

289
patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch
View File

@@ -11,37 +11,110 @@
+ {"remove-cross-origin-referrers",
+ "Remove Cross-Origin Referrers",
+ "Removes all cross-origin referrers. Has lower precedence than remove-referrers. ungoogled-chromium flag.",
+ kOsAll, FEATURE_VALUE_TYPE(features::kNoCrossOriginReferrers)},
+ kOsAll, FEATURE_VALUE_TYPE(network::features::kNoCrossOriginReferrers)},
+ {"minimal-referrers",
+ "Minimal Referrers",
+ "Removes all cross-origin referrers and strips same-origin referrers down to the origin. Has lower precedence than remove-cross-origin-referrers. ungoogled-chromium flag.",
+ kOsAll, FEATURE_VALUE_TYPE(features::kMinimalReferrers)},
+ kOsAll, FEATURE_VALUE_TYPE(network::features::kMinimalReferrers)},
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -159,6 +159,8 @@ static_library("common_lib") {
"pref_names_util.cc",
"pref_names_util.h",
"ref_counted_util.h",
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -161,6 +161,7 @@
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/header_util.h"
#include "services/network/public/cpp/is_potentially_trustworthy.h"
+#include "services/network/public/cpp/referrer_sanitizer.h"
#include "services/network/public/cpp/resource_request_body.h"
#include "services/network/public/cpp/supports_loading_mode/supports_loading_mode_parser.h"
#include "services/network/public/cpp/url_loader_completion_status.h"
@@ -400,10 +401,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
- if (!render_prefs.enable_referrers) {
- *referrer =
- blink::mojom::Referrer(GURL(), network::mojom::ReferrerPolicy::kNever);
- }
+ auto sanitized_referrer = referrer_sanitizer::sanitize_referrer(
+ referrer->url, url, referrer->policy, render_prefs.enable_referrers);
+ *referrer = blink::mojom::Referrer(std::move(sanitized_referrer.first),
+ std::move(sanitized_referrer.second));
// Next, set the HTTP Origin if needed.
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -133,6 +133,7 @@
#include "services/metrics/public/cpp/ukm_source_id.h"
#include "services/network/public/cpp/features.h"
#include "services/network/public/cpp/not_implemented_url_loader_factory.h"
+#include "services/network/public/cpp/referrer_sanitizer.h"
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom.h"
#include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
@@ -4656,10 +4657,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
- if (!GetWebView()->GetRendererPreferences().enable_referrers) {
- request.SetReferrerString(WebString());
- request.SetReferrerPolicy(network::mojom::ReferrerPolicy::kNever);
- }
+ auto sanitized_referrer = referrer_sanitizer::sanitize_referrer(
+ WebStringToGURL(request.ReferrerString()),
+ WebStringToGURL(request.Url().GetString()), request.GetReferrerPolicy(),
+ GetWebView()->GetRendererPreferences().enable_referrers);
+ request.SetReferrerString(
+ WebString::FromUTF8(sanitized_referrer.first.spec()));
+ request.SetReferrerPolicy(std::move(sanitized_referrer.second));
}
void RenderFrameImpl::DidLoadResourceFromMemoryCache(
--- a/services/network/network_service_network_delegate.cc
+++ b/services/network/network_service_network_delegate.cc
@@ -30,6 +30,7 @@
#include "services/network/network_service_proxy_delegate.h"
#include "services/network/pending_callback_chain.h"
#include "services/network/public/cpp/features.h"
+#include "services/network/public/cpp/referrer_sanitizer.h"
#include "services/network/url_loader.h"
#include "url/gurl.h"
@@ -57,9 +58,14 @@ NetworkServiceNetworkDelegate::~NetworkS
void NetworkServiceNetworkDelegate::MaybeTruncateReferrer(
net::URLRequest* const request,
const GURL& effective_url) {
- if (!enable_referrers_) {
- request->SetReferrer(std::string());
- request->set_referrer_policy(net::ReferrerPolicy::NO_REFERRER);
+
+ auto sanitized_referrer = referrer_sanitizer::sanitize_referrer(
+ GURL(request->referrer()), effective_url,
+ request->referrer_policy(), enable_referrers_);
+ if (sanitized_referrer.first != effective_url.spec() ||
+ sanitized_referrer.second != request->referrer_policy()) {
+ request->SetReferrer(sanitized_referrer.first.spec());
+ request->set_referrer_policy(std::move(sanitized_referrer.second));
return;
}
--- a/services/network/public/cpp/BUILD.gn
+++ b/services/network/public/cpp/BUILD.gn
@@ -111,6 +111,8 @@ component("cpp") {
"private_network_access_check_result.cc",
"private_network_access_check_result.h",
"record_ontransfersizeupdate_utils.h",
+ "referrer_sanitizer.cc",
+ "referrer_sanitizer.h",
"search/instant_mojom_traits.h",
"search/instant_types.cc",
"search/instant_types.h",
@@ -275,6 +277,7 @@ static_library("common_lib") {
"//components/no_state_prefetch/common:mojo_bindings",
"//components/page_load_metrics/common:common",
"//components/pdf/common:constants",
+ "//services/network/public/mojom",
]
if (is_android || enable_library_cdms) {
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -954,6 +954,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
// referrers instead of their ordinary behavior.
BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT);
"request_destination.cc",
"request_destination.h",
"request_mode.cc",
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -17,6 +17,14 @@
#include "url/origin.h"
namespace network::features {
+BASE_FEATURE(kMinimalReferrers,
+ "MinimalReferrers",
+ base::FEATURE_DISABLED_BY_DEFAULT);
@@ -50,43 +123,44 @@
+ "NoCrossOriginReferrers",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+
#if BUILDFLAG(IS_WIN)
// Changes behavior of requireInteraction for notifications. Instead of staying
// on-screen until dismissed, they are instead shown for a very long time.
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h
@@ -559,6 +559,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers);
// Enables the Accept-CH support disabler. If this feature is activated, Chrome
// ignore Accept-CH response headers for a site that is specified in the
--- a/services/network/public/cpp/features.h
+++ b/services/network/public/cpp/features.h
@@ -17,6 +17,10 @@ class Origin;
} // namespace url
+COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kMinimalReferrers);
namespace network::features {
+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kMinimalReferrers);
+
+COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoCrossOriginReferrers);
+COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kNoCrossOriginReferrers);
+
#if BUILDFLAG(IS_WIN)
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kNotificationDurationLongForRequireInteraction);
COMPONENT_EXPORT(NETWORK_CPP) BASE_DECLARE_FEATURE(kBlockAcceptClientHints);
COMPONENT_EXPORT(NETWORK_CPP)
--- /dev/null
+++ b/chrome/common/referrer_sanitizer.cc
@@ -0,0 +1,48 @@
+++ b/services/network/public/cpp/referrer_sanitizer.cc
@@ -0,0 +1,49 @@
+// Copyright 2023 The ungoogled-chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "referrer_sanitizer.h"
+#include "services/network/public/cpp/referrer_sanitizer.h"
+
+#include "base/feature_list.h"
+#include "chrome/common/chrome_features.h"
+#include "services/network/public/cpp/features.h"
+#include "url/origin.h"
+
+namespace referrer_sanitizer {
+
+static GURL sanitize_referrer_internal(const GURL& origin,
+ const GURL& destination) {
+ if ((base::FeatureList::IsEnabled(features::kNoCrossOriginReferrers) ||
+ base::FeatureList::IsEnabled(features::kMinimalReferrers)) &&
+ if ((base::FeatureList::IsEnabled(network::features::kNoCrossOriginReferrers) ||
+ base::FeatureList::IsEnabled(network::features::kMinimalReferrers)) &&
+ !url::IsSameOriginWith(origin, destination)) {
+ return GURL();
+ } else if (base::FeatureList::IsEnabled(features::kMinimalReferrers)) {
+ } else if (base::FeatureList::IsEnabled(network::features::kMinimalReferrers)) {
+ return url::Origin::Create(origin).GetURL();
+ }
+ return origin;
@@ -118,14 +192,14 @@
+
+} // namespace referrer_sanitizer
--- /dev/null
+++ b/chrome/common/referrer_sanitizer.h
+++ b/services/network/public/cpp/referrer_sanitizer.h
@@ -0,0 +1,30 @@
+// Copyright 2023 The ungoogled-chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_COMMON_REFERRER_SANITIZER_H_
+#define CHROME_COMMON_REFERRER_SANITIZER_H_
+#ifndef SERVICES_NETWORK_PUBLIC_CPP_REFERRER_SANITIZER_H_
+#define SERVICES_NETWORK_PUBLIC_CPP_REFERRER_SANITIZER_H_
+
+#include <string>
+#include <utility>
@@ -149,119 +223,14 @@
+
+} // namespace referrer_sanitizer
+
+#endif // CHROME_COMMON_REFERRER_SANITIZER_H_
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -357,8 +357,7 @@ source_set("lib") {
"//base",
"//build:branding_buildflags",
"//build:chromeos_buildflags",
- "//chrome/common:constants",
- "//chrome/common:version_header",
+ "//chrome/common",
"//chrome/test/chromedriver/constants:version_header",
"//components/crx_file",
"//components/embedder_support",
--- a/content/browser/renderer_host/navigation_request.cc
+++ b/content/browser/renderer_host/navigation_request.cc
@@ -42,6 +42,7 @@
#include "build/build_config.h"
#include "build/buildflag.h"
#include "build/chromeos_buildflags.h"
+#include "chrome/common/referrer_sanitizer.h"
#include "components/viz/host/host_frame_sink_manager.h"
#include "content/browser/agent_cluster_key.h"
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
@@ -393,10 +394,10 @@ void AddAdditionalRequestHeaders(
net::HttpRequestHeaders::kUserAgent,
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
- if (!render_prefs.enable_referrers) {
- *referrer =
- blink::mojom::Referrer(GURL(), network::mojom::ReferrerPolicy::kNever);
- }
+ auto sanitized_referrer = referrer_sanitizer::sanitize_referrer(
+ referrer->url, url, referrer->policy, render_prefs.enable_referrers);
+ *referrer = blink::mojom::Referrer(std::move(sanitized_referrer.first),
+ std::move(sanitized_referrer.second));
// Next, set the HTTP Origin if needed.
if (NeedsHTTPOrigin(headers, method)) {
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -55,6 +55,7 @@
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "cc/base/switches.h"
+#include "chrome/common/referrer_sanitizer.h"
#include "content/common/associated_interfaces.mojom.h"
#include "content/common/content_navigation_policy.h"
#include "content/common/content_switches_internal.h"
@@ -4649,10 +4650,13 @@ void RenderFrameImpl::FinalizeRequestInt
request.SetHasUserGesture(frame_->HasTransientUserActivation());
- if (!GetWebView()->GetRendererPreferences().enable_referrers) {
- request.SetReferrerString(WebString());
- request.SetReferrerPolicy(network::mojom::ReferrerPolicy::kNever);
- }
+ auto sanitized_referrer = referrer_sanitizer::sanitize_referrer(
+ WebStringToGURL(request.ReferrerString()),
+ WebStringToGURL(request.Url().GetString()), request.GetReferrerPolicy(),
+ GetWebView()->GetRendererPreferences().enable_referrers);
+ request.SetReferrerString(
+ WebString::FromUTF8(sanitized_referrer.first.spec()));
+ request.SetReferrerPolicy(std::move(sanitized_referrer.second));
}
void RenderFrameImpl::DidLoadResourceFromMemoryCache(
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -313,6 +313,7 @@ static_library("content_shell_lib") {
"//base:base_static",
"//build:chromeos_buildflags",
"//cc/base",
+ "//chrome/common",
"//components/cdm/renderer",
"//components/custom_handlers",
"//components/custom_handlers:test_support",
--- a/services/network/network_service_network_delegate.cc
+++ b/services/network/network_service_network_delegate.cc
@@ -13,6 +13,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/types/optional_util.h"
#include "build/build_config.h"
+#include "chrome/common/referrer_sanitizer.h"
#include "components/domain_reliability/monitor.h"
#include "net/base/features.h"
#include "net/base/isolation_info.h"
@@ -57,9 +58,14 @@ NetworkServiceNetworkDelegate::~NetworkS
void NetworkServiceNetworkDelegate::MaybeTruncateReferrer(
net::URLRequest* const request,
const GURL& effective_url) {
- if (!enable_referrers_) {
- request->SetReferrer(std::string());
- request->set_referrer_policy(net::ReferrerPolicy::NO_REFERRER);
+
+ auto sanitized_referrer = referrer_sanitizer::sanitize_referrer(
+ GURL(request->referrer()), effective_url,
+ request->referrer_policy(), enable_referrers_);
+ if (sanitized_referrer.first != effective_url.spec() ||
+ sanitized_referrer.second != request->referrer_policy()) {
+ request->SetReferrer(sanitized_referrer.first.spec());
+ request->set_referrer_policy(std::move(sanitized_referrer.second));
return;
}
+#endif // SERVICES_NETWORK_PUBLIC_CPP_REFERRER_SANITIZER_H_
--- a/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc
+++ b/third_party/blink/renderer/modules/service_worker/web_service_worker_fetch_context_impl.cc
@@ -9,12 +9,14 @@
#include "base/ranges/algorithm.h"
#include "base/synchronization/waitable_event.h"
@@ -11,10 +11,12 @@
#include "base/task/single_thread_task_runner.h"
+#include "chrome/common/referrer_sanitizer.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "net/cookies/site_for_cookies.h"
+#include "services/network/public/cpp/referrer_sanitizer.h"
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
#include "services/network/public/mojom/fetch_api.mojom-shared.h"
#include "third_party/blink/public/common/loader/loader_constants.h"
@@ -294,7 +263,7 @@
#include "base/task/sequenced_task_runner.h"
#include "base/task/single_thread_task_runner.h"
#include "base/task/thread_pool.h"
+#include "chrome/common/referrer_sanitizer.h"
+#include "services/network/public/cpp/referrer_sanitizer.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/wrapper_shared_url_loader_factory.h"
#include "third_party/blink/public/common/features.h"
@@ -324,13 +293,3 @@
}
WebVector<std::unique_ptr<URLLoaderThrottle>>
--- a/tools/v8_context_snapshot/BUILD.gn
+++ b/tools/v8_context_snapshot/BUILD.gn
@@ -87,6 +87,7 @@ if (use_v8_context_snapshot) {
sources = [ "v8_context_snapshot_generator.cc" ]
deps = [
+ "//chrome/common",
"//gin:gin",
"//mojo/core/embedder",
"//services/service_manager/public/cpp",

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

@@ -98,7 +98,7 @@
urlLocked: boolean;
}
@@ -99,7 +100,7 @@ export interface SearchEnginesBrowserPro
@@ -100,7 +101,7 @@ export interface SearchEnginesBrowserPro
searchEngineEditCancelled(): void;
searchEngineEditCompleted(
@@ -107,7 +107,7 @@
getSearchEnginesList(): Promise<SearchEnginesInfo>;
@@ -141,11 +142,12 @@ export class SearchEnginesBrowserProxyIm
@@ -147,11 +148,12 @@ export class SearchEnginesBrowserProxyIm
}
searchEngineEditCompleted(
@@ -341,7 +341,7 @@
// Dummy number used for indicating that a new search engine is added.
const int kNewSearchEngineIndex = -1;
@@ -222,6 +223,8 @@ base::Value::Dict SearchEnginesHandler::
@@ -226,6 +227,8 @@ base::Value::Dict SearchEnginesHandler::
Profile* profile = Profile::FromWebUI(web_ui());
dict.Set("url",
template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
@@ -350,7 +350,7 @@
dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
(template_url->starter_pack_id() > 0)));
GURL icon_url = template_url->favicon_url();
@@ -358,12 +361,14 @@ void SearchEnginesHandler::HandleSearchE
@@ -400,12 +403,14 @@ void SearchEnginesHandler::HandleSearchE
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
const std::u16string& title,
const std::u16string& keyword,
@@ -368,7 +368,7 @@
edit_controller_.reset();
}
@@ -391,6 +396,8 @@ bool SearchEnginesHandler::CheckFieldVal
@@ -433,6 +438,8 @@ bool SearchEnginesHandler::CheckFieldVal
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
else if (field_name.compare(kQueryUrlField) == 0)
is_valid = edit_controller_->IsURLValid(field_value);
@@ -377,7 +377,7 @@
else
NOTREACHED_IN_MIGRATION();
@@ -410,18 +417,21 @@ void SearchEnginesHandler::HandleSearchE
@@ -452,18 +459,21 @@ void SearchEnginesHandler::HandleSearchE
if (!edit_controller_.get())
return;
@@ -414,7 +414,7 @@
// SettingsPageUIHandler implementation.
void RegisterMessages() override;
@@ -75,8 +76,8 @@ class SearchEnginesHandler : public Sett
@@ -80,8 +81,8 @@ class SearchEnginesHandler : public Sett
// to WebUI. Called from WebUI.
void HandleValidateSearchEngineInput(const base::Value::List& args);
@@ -447,7 +447,7 @@
}
--- a/components/search_engines/template_url_service.h
+++ b/components/search_engines/template_url_service.h
@@ -314,7 +314,8 @@ class TemplateURLService final : public
@@ -318,7 +318,8 @@ class TemplateURLService final : public
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
@@ -4230,7 +4230,13 @@ const FeatureEntry::FeatureVariation
@@ -4233,7 +4233,13 @@ const FeatureEntry::FeatureVariation
// calculate and verify checksum.
//
// When adding a new choice, add it to the end of the list.

2
patches/extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -109,7 +109,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -107,7 +107,7 @@ void RegisterBrowserUserPrefs(user_prefs
false);
#endif
registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,

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

@@ -10,7 +10,7 @@
#include "crypto/secure_hash.h"
#if BUILDFLAG(IS_ANDROID)
@@ -531,94 +530,10 @@ DownloadInterruptReason BaseFile::Publis
@@ -534,94 +533,10 @@ DownloadInterruptReason BaseFile::Publis
}
#endif // BUILDFLAG(IS_ANDROID)
@@ -105,7 +105,7 @@
}
void BaseFile::AnnotateWithSourceInformation(
@@ -628,32 +543,8 @@ void BaseFile::AnnotateWithSourceInforma
@@ -631,32 +546,8 @@ void BaseFile::AnnotateWithSourceInforma
const std::optional<url::Origin>& request_initiator,
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
OnAnnotationDoneCallback on_annotation_done_callback) {

6
patches/extra/ungoogled-chromium/disable-downloads-page-referrer-url.patch
View File

@@ -1,11 +1,11 @@
--- a/components/safe_browsing/core/common/features.cc
+++ b/components/safe_browsing/core/common/features.cc
@@ -195,7 +195,7 @@ constexpr base::FeatureParam<int> kHashP
@@ -207,7 +207,7 @@ constexpr base::FeatureParam<int> kHashP
BASE_FEATURE(kDownloadsPageReferrerUrl,
"DownloadsPageReferrerUrl",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kHashDatabaseOffsetMap,
"SafeBrowsingHashDatabaseOffsetMap",
BASE_FEATURE(kEnterprisePasswordReuseUiRefresh,
"EnterprisePasswordReuseUiRefresh",

2
patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch
View File

@@ -1,6 +1,6 @@
--- a/components/optimization_guide/core/optimization_guide_features.cc
+++ b/components/optimization_guide/core/optimization_guide_features.cc
@@ -56,7 +56,7 @@ BASE_FEATURE(kOptimizationHints,
@@ -55,7 +55,7 @@ BASE_FEATURE(kOptimizationHints,
// Enables fetching from a remote Optimization Guide Service.
BASE_FEATURE(kRemoteOptimizationGuideFetching,
"OptimizationHintsFetching",

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
@@ -3836,8 +3836,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3852,8 +3852,7 @@ ScriptValue WebGLRenderingContextBase::g
pname, IdentifiabilityBenignStringToken(
String(ContextGL()->GetString(GL_RENDERER))));
}
@@ -13,7 +13,7 @@
}
SynthesizeGLError(
GL_INVALID_ENUM, "getParameter",
@@ -3851,8 +3850,7 @@ ScriptValue WebGLRenderingContextBase::g
@@ -3867,8 +3866,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
@@ -1858,7 +1858,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
@@ -1933,7 +1933,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
// crbug.com/988956.
BASE_FEATURE(kPrefetchPrivacyChanges,
"PrefetchPrivacyChanges",

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

@@ -14,7 +14,7 @@
}
return content_restrictions;
}
@@ -1759,8 +1754,7 @@ bool CanSavePage(const Browser* browser)
@@ -1751,8 +1746,7 @@ bool CanSavePage(const Browser* browser)
DownloadPrefs::DownloadRestriction::ALL_FILES) {
return false;
}

46
patches/extra/ungoogled-chromium/first-run-page.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1115,6 +1115,7 @@ int ChromeBrowserMainParts::PreCreateThr
@@ -1111,6 +1111,7 @@ int ChromeBrowserMainParts::PreCreateThr
if (first_run::IsChromeFirstRun()) {
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
@@ -8,28 +8,27 @@
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -49,6 +49,7 @@
#include "chrome/browser/ui/webui/policy/policy_ui.h"
#include "chrome/browser/ui/webui/privacy_sandbox/privacy_sandbox_internals_ui.h"
#include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h"
--- a/chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -39,6 +39,7 @@
#include "chrome/browser/ui/webui/signin_internals_ui.h"
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
+#include "chrome/browser/ui/webui/ungoogled_first_run.h"
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/buildflags.h"
#include "chrome/common/chrome_features.h"
@@ -692,6 +693,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
return &NewWebUI<privacy_sandbox_internals::PrivacySandboxInternalsUI>;
}
+ if (url.host() == "ungoogled-first-run") return &NewWebUI<UngoogledFirstRun>;
+
return nullptr;
}
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
#include "chrome/browser/ui/webui/version/version_ui.h"
@@ -243,6 +244,7 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<SiteEngagementUIConfig>());
map.AddWebUIConfig(std::make_unique<SyncInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<TranslateInternalsUIConfig>());
+ map.AddWebUIConfig(std::make_unique<UngoogledFirstRunUIConfig>());
map.AddWebUIConfig(std::make_unique<UsbInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<UserActionsUIConfig>());
map.AddWebUIConfig(std::make_unique<VersionUIConfig>());
--- /dev/null
+++ b/chrome/browser/ui/webui/ungoogled_first_run.h
@@ -0,0 +1,137 @@
@@ -0,0 +1,144 @@
+#ifndef CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
+#define CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
+
@@ -38,6 +37,7 @@
+#include "content/public/browser/url_data_source.h"
+#include "content/public/browser/web_ui.h"
+#include "content/public/browser/web_ui_controller.h"
+#include "content/public/browser/webui_config.h"
+#include "services/network/public/mojom/content_security_policy.mojom.h"
+
+class UFRDataSource : public content::URLDataSource {
@@ -157,6 +157,12 @@
+ }
+};
+
+class UngoogledFirstRun;
+class UngoogledFirstRunUIConfig : public content::DefaultWebUIConfig<UngoogledFirstRun> {
+ public:
+ UngoogledFirstRunUIConfig() : DefaultWebUIConfig("chrome", "ungoogled-first-run") {}
+};
+
+class UngoogledFirstRun : public content::WebUIController {
+ public:
+ UngoogledFirstRun(content::WebUI* web_ui) : content::WebUIController(web_ui) {

4
patches/extra/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch
View File

@@ -2,10 +2,10 @@
--- a/chrome/browser/extensions/api/BUILD.gn
+++ b/chrome/browser/extensions/api/BUILD.gn
@@ -34,7 +34,6 @@ group("api_implementations") {
"//chrome/browser/extensions/api/downloads_internal",
@@ -36,7 +36,6 @@ group("api_implementations") {
"//chrome/browser/extensions/api/experimental_ai_data",
"//chrome/browser/extensions/api/font_settings",
"//chrome/browser/extensions/api/idltest",
- "//chrome/browser/extensions/api/mdns",
"//chrome/browser/extensions/api/module",
"//chrome/browser/extensions/api/networking_private",

4
patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
View File

@@ -3,11 +3,11 @@
#
--- a/components/omnibox/common/omnibox_features.cc
+++ b/components/omnibox/common/omnibox_features.cc
@@ -511,7 +511,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
@@ -373,7 +373,7 @@ BASE_FEATURE(kSiteSearchSettingsPolicy,
// Enables additional site search providers for the Site search Starter Pack.
BASE_FEATURE(kStarterPackExpansion,
"StarterPackExpansion",
- enabled_by_default_desktop_only);
- enable_if(!IS_ANDROID && !IS_IOS));
+ base::FEATURE_DISABLED_BY_DEFAULT);
// Enables an informational IPH message at the bottom of the Omnibox directing

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
@@ -75,7 +75,6 @@ const char* const kBadFlags[] = {
@@ -73,7 +73,6 @@ const char* const kBadFlags[] = {
// These flags disable sandbox-related security.
sandbox::policy::switches::kDisableGpuSandbox,
sandbox::policy::switches::kDisableSeccompFilterSandbox,

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

@@ -51,7 +51,7 @@
shownAppsCount_, shownExtensionsCount_, apps, extensions)]]">
--- a/chrome/browser/resources/extensions/sidebar.html
+++ b/chrome/browser/resources/extensions/sidebar.html
@@ -74,12 +74,3 @@ cr-shared-style">
@@ -24,12 +24,3 @@
<cr-ripple></cr-ripple>
</a>
</cr-menu-selector>
@@ -60,39 +60,17 @@
- <cr-icon id="web-store-icon" icon="extensions-icons:web_store">
- </cr-icon>
- <span id="discover-more-text" class="cr-secondary-text"
- on-click="onMoreExtensionsClick_"
- inner-h-t-m-l="[[discoverMoreText_]]"></span>
- @click="${this.onMoreExtensionsClick_}"
- .innerHTML="${this.computeDiscoverMoreText_()}"></span>
- <cr-ripple></cr-ripple>
-</div>
--- a/chrome/browser/resources/extensions/sidebar.ts
+++ b/chrome/browser/resources/extensions/sidebar.ts
@@ -51,21 +51,11 @@ export class ExtensionsSidebarElement ex
* displayed.
*/
selectedPath_: String,
-
- /**
- * The text displayed in the sidebar containing the link to open the
- * Chrome Web Store to get more extensions.
- */
- discoverMoreText_: {
- type: String,
- computed: 'computeDiscoverMoreText_()',
- },
};
}
enableEnhancedSiteControls: boolean;
private selectedPath_: Page;
- private discoverMoreText_: TrustedHTML;
/**
* The ID of the listener on |navigation|. Stored so that the
@@ -121,13 +111,6 @@ export class ExtensionsSidebarElement ex
@@ -111,13 +111,6 @@ export class ExtensionsSidebarElement ex
}
}
- private computeDiscoverMoreText_(): TrustedHTML {
- protected computeDiscoverMoreText_(): TrustedHTML {
- return this.i18nAdvanced('sidebarDiscoverMore', {
- tags: ['a'],
- attrs: ['target'],
@@ -101,7 +79,7 @@
- }
}
declare global {
// Exported to be used in the autogenerated Lit template file
--- a/chrome/browser/resources/history/side_bar.html
+++ b/chrome/browser/resources/history/side_bar.html
@@ -88,13 +88,6 @@
@@ -155,7 +133,7 @@
<template is="dom-if" if="[[!captionSettingsOpensExternally_]]">
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -52,7 +52,7 @@
@@ -57,7 +57,7 @@
<div class="cr-row two-line">
<!-- Set the icon from the iconset (when it's obsolete/EOL and
when update is done) or set the src (when it's updating). -->
@@ -163,8 +141,8 @@
+<if expr="False">
<div class="icon-container"
hidden="[[!shouldShowIcons_(showUpdateStatus_)]]">
<iron-icon
@@ -64,7 +64,7 @@
<cr-icon
@@ -72,7 +72,7 @@
</div>
</if>
<div class="flex cr-padded-text">
@@ -173,7 +151,7 @@
<div id="updateStatusMessage" hidden="[[!showUpdateStatus_]]">
<div role="alert" aria-live="polite"
inner-h-t-m-l="[[getUpdateStatusMessage_(
@@ -120,9 +120,6 @@
@@ -128,9 +128,6 @@
</div>
</template>
</if>
@@ -265,7 +243,7 @@
import '../privacy_page/privacy_page.js';
import '../safety_check_page/safety_check_page.js';
import '../safety_hub/safety_hub_entry_point.js';
@@ -259,7 +258,6 @@ export class SettingsBasicPageElement ex
@@ -270,7 +269,6 @@ export class SettingsBasicPageElement ex
this.showPrivacyGuidePromo_ = false;
return;
}
@@ -330,7 +308,7 @@
class="hr"
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
@@ -223,10 +223,6 @@ export class SettingsPersonalizationOpti
@@ -229,10 +229,6 @@ export class SettingsPersonalizationOpti
'chrome-signin-user-choice-info-change',
this.setChromeSigninUserChoiceInfo_.bind(this));
// </if>
@@ -398,7 +376,7 @@
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
--- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc
@@ -346,7 +346,6 @@ void RecentTabsSubMenuModel::Build() {
@@ -365,7 +365,6 @@ void RecentTabsSubMenuModel::Build() {
AddSeparator(ui::NORMAL_SEPARATOR);
history_separator_index_ = GetItemCount() - 1;
BuildLocalEntries();
@@ -408,7 +386,7 @@
void RecentTabsSubMenuModel::BuildLocalEntries() {
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -924,16 +924,6 @@ void ExtensionsMenuModel::Build(Browser*
@@ -934,16 +934,6 @@ void ExtensionsMenuModel::Build(Browser*
SetElementIdentifierAt(
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
kManageExtensionsMenuItem);
@@ -427,7 +405,7 @@
////////////////////////////////////////////////////////////////////////////////
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -643,13 +643,6 @@ void BookmarkMenuDelegate::BuildMenu(con
@@ -671,13 +671,6 @@ void BookmarkMenuDelegate::BuildMenu(con
ui::ImageModel bookmarks_side_panel_icon = ui::ImageModel::FromVectorIcon(
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
ui::SimpleMenuModel::kDefaultIconSize);
@@ -460,7 +438,7 @@
void CookieControlsContentView::AddDescriptionRow() {
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -188,6 +188,7 @@ void ProfileMenuView::BuildMenu() {
@@ -211,6 +211,7 @@ void ProfileMenuView::BuildMenu() {
}
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
@@ -468,7 +446,7 @@
Profile* profile = browser()->profile();
if (profile->IsOffTheRecord() || profile->IsGuestSession())
return gfx::ImageSkia();
@@ -565,16 +566,8 @@ void ProfileMenuView::BuildIdentity() {
@@ -571,16 +572,8 @@ void ProfileMenuView::BuildIdentity() {
badge_image_model, menu_title_, menu_subtitle_, management_label);
} else {
std::string profile_user_display_name, profile_user_email;
@@ -488,7 +466,7 @@
profile_user_email.empty() ? account_info.email : profile_user_email);
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -559,9 +559,6 @@ SadTabView::SadTabView(content::WebConte
@@ -562,9 +562,6 @@ SadTabView::SadTabView(content::WebConte
auto* actions_container =
container->AddChildView(std::make_unique<views::FlexLayoutView>());
actions_container->SetCrossAxisAlignment(views::LayoutAlignment::kCenter);
@@ -498,7 +476,7 @@
action_button_ =
actions_container->AddChildView(std::make_unique<views::MdTextButton>(
base::BindRepeating(&SadTabView::PerformAction,
@@ -654,22 +651,6 @@ void SadTabView::AttachToWebView() {
@@ -657,22 +654,6 @@ void SadTabView::AttachToWebView() {
}
}
@@ -523,7 +501,7 @@
// Specify the maximum message and title width explicitly.
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3347,7 +3347,7 @@ void AddSiteSettingsStrings(content::Web
@@ -3466,7 +3466,7 @@ void AddSiteSettingsStrings(content::Web
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
@@ -534,7 +512,7 @@
html_source->AddBoolean(
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -932,7 +932,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
@@ -908,7 +908,7 @@ BASE_FEATURE(kLacrosUseAshWidevine,
#endif
// Enables the Live Caption feature on supported devices.
@@ -545,7 +523,7 @@
// getDisplayMedia captures. Note: This flag does not control if the "Share this
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -832,7 +832,7 @@ void MenuItemView::SetAlerted() {
@@ -836,7 +836,7 @@ void MenuItemView::SetAlerted() {
}
bool MenuItemView::ShouldShowNewBadge() const {

1
patches/series
View File

@@ -1,3 +1,4 @@
upstream-fixes/glue_core_pools.patch
upstream-fixes/hardware_destructive_interference_size.patch
upstream-fixes/missing-dependencies.patch

27
patches/upstream-fixes/glue_core_pools.patch Normal file
View File

@@ -0,0 +1,27 @@
# glue_core_pools was partially removed in:
# https://chromium-review.googlesource.com/c/chromium/src/+/5922801
# This removes the remaining references needed to build
--- a/base/allocator/partition_allocator/partition_alloc.gni
+++ b/base/allocator/partition_allocator/partition_alloc.gni
@@ -193,9 +193,6 @@ declare_args() {
force_enable_raw_ptr_exclusion = false
}
-assert(!enable_pointer_compression_support || glue_core_pools,
- "Pointer compression relies on core pools being contiguous.")
-
declare_args() {
# We want to use RawPtrBackupRefImpl as the raw_ptr<> implementation
# iff BRP support is enabled. However, for purpose of performance
--- a/base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.h
+++ b/base/allocator/partition_allocator/src/partition_alloc/compressed_pointer.h
@@ -16,9 +16,6 @@
#if PA_BUILDFLAG(ENABLE_POINTER_COMPRESSION)
-#if !PA_BUILDFLAG(GLUE_CORE_POOLS)
-#error "Pointer compression only works with glued pools"
-#endif
#if PA_CONFIG(DYNAMICALLY_SELECT_POOL_SIZE)
#error "Pointer compression currently supports constant pool size"
#endif

57
patches/upstream-fixes/missing-dependencies.patch
View File

@@ -1,6 +1,6 @@
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -897,6 +897,7 @@ source_set("extensions") {
@@ -883,6 +883,7 @@ source_set("extensions") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser/web_ui:web_ui",
@@ -20,7 +20,7 @@
#include <vector>
--- a/chrome/browser/ui/lens/lens_overlay_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_controller.cc
@@ -12,6 +12,7 @@
@@ -14,6 +14,7 @@
#include "base/system/sys_info.h"
#include "base/task/bind_post_task.h"
#include "base/task/sequenced_task_runner.h"
@@ -40,7 +40,7 @@
#include "chrome/browser/browser_process.h"
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -554,6 +554,7 @@ static_library("url_constants") {
@@ -555,6 +555,7 @@ static_library("url_constants") {
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
"//components/password_manager/content/common",
"//components/safe_browsing/core/common",
@@ -60,7 +60,7 @@
# Disallow depending on content.
--- a/components/plus_addresses/BUILD.gn
+++ b/components/plus_addresses/BUILD.gn
@@ -101,6 +101,7 @@ source_set("plus_addresses") {
@@ -111,6 +111,7 @@ source_set("plus_addresses") {
"//net",
"//services/data_decoder/public/cpp",
"//services/network/public/cpp",
@@ -70,15 +70,7 @@
public_deps = [
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -92,6 +92,7 @@ source_set("browser") {
"//cc/animation",
"//cc/mojo_embedder",
"//cc/paint",
+ "//chrome/common:buildflags",
"//components/attribution_reporting:data_host_mojom",
"//components/attribution_reporting:mojom",
"//components/back_forward_cache:enum",
@@ -104,6 +105,7 @@ source_set("browser") {
@@ -105,6 +105,7 @@ source_set("browser") {
"//components/file_access",
"//components/filename_generation",
"//components/input",
@@ -86,45 +78,6 @@
"//components/link_header_util",
"//components/metrics",
"//components/metrics:single_sample_metrics",
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -71,7 +71,7 @@ if (is_ios) {
# Omit Lacros because it allows //components to depend on //chrome, which in
# turn depends on //extensions.
-if (!is_chromeos_lacros) {
+if (false) {
disallowed_extension_deps_ = [
# Components should largely not depend on //extensions. Since // extensions
# is not a component target and is linked with //chrome, depending on most
@@ -877,7 +877,7 @@ test("components_unittests") {
# On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
- if (!is_chromeos_lacros) {
+ if (false) {
assert_no_deps = [ "//chrome/*" ]
assert_no_deps += disallowed_extension_deps_
}
@@ -1170,7 +1170,7 @@ if (use_blink) {
# dependency. On other platforms, no components should depend on Chrome.
# Since //chrome depends on //extensions, we also only assert_no_deps on
# extensions targets for non-lacros builds.
- if (!is_chromeos_lacros) {
+ if (false) {
assert_no_deps = [ "//chrome/*" ]
assert_no_deps += disallowed_extension_deps_
}
--- a/pdf/pdfium/pdfium_engine_exports.h
+++ b/pdf/pdfium/pdfium_engine_exports.h
@@ -15,6 +15,7 @@
#include "build/build_config.h"
#include "pdf/document_metadata.h"
#include "services/screen_ai/buildflags/buildflags.h"
+#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size_f.h"
#if BUILDFLAG(IS_WIN)
--- a/services/passage_embeddings/BUILD.gn
+++ b/services/passage_embeddings/BUILD.gn
@@ -31,6 +31,7 @@ source_set("passage_embeddings") {

92
pruning.list
View File

@@ -99,6 +99,7 @@ chrome/browser/resources/chromeos/accessibility/common/testing/fake_facegaze_ass
chrome/browser/resources/chromeos/accessibility/common/testing/fake_pumpkin_dlc.tar.xz
chrome/browser/resources/chromeos/accessibility/select_to_speak/earcons/null_selection.ogg
chrome/browser/resources/media/mei_preload/preloaded_data.pb
chrome/browser/ui/ash/focus_mode/test/data/certificate_sha1.crt
chrome/credential_provider/eventlog/gcp_eventlog_messages.mc
chrome/installer/linux/debian/repo_signing_keys.gpg
chrome/installer/test/data/SETUP.EX_
@@ -236,6 +237,7 @@ components/test/data/history/HistoryNoDuration
components/test/data/history/HistoryNoSource
components/test/data/history/History_with_starred
components/test/data/history_embeddings/fake_search_strings_file
components/test/data/history_embeddings/word_match_boost_test_data
components/test/data/media_router/common/providers/cast/certificate/testsuite/testsuite1.pb
components/test/data/omnibox/adder.tflite
components/test/data/omnibox/on_device_head_test_deep_model.bin
@@ -1368,6 +1370,7 @@ net/tools/testserver/dist/_socket.pyd
net/tools/testserver/dist/_ssl.pyd
pdf/pdfium/fuzzers/corpora/pdf_codec_tiff/not_kitty.tiff
pdf/pdfium/fuzzers/corpora/pdf_jpx/not_kitty.jp2
pdf/test/data/bigtable_micro.in
printing/test/data/emf/test4.emf
remoting/host/installer/mac/Keystone/GoogleSoftwareUpdate.pkg
services/device/hid/fuzz_corpus/report0
@@ -61186,10 +61189,12 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-cluster-navigation.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-last-cluster-max-duration.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-multiple-frames.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-no-nav.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/cls-single-frame.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/enhanced-traces.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/extension-tracks-and-marks.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/fenced-frame-fledge.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/font-display.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/forced-layouts-and-no-gpu.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/generic-about-tracing.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/idle-callback.json.gz
@@ -61214,9 +61219,11 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/lcp-
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/load-simple.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/loading-dt1.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/mainWasm_profile.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/many-redirects.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/many-requests.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/missing-process-data.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/missing-tracing-start.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/missing-url.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/multiple-lcp-main-frame.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/multiple-navigations-render-blocking.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/multiple-navigations-same-id.json.gz
@@ -61228,6 +61235,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/nest
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/network-requests-initiators.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/network-websocket-messages.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/node-fibonacci-website.cpuprofile.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/non-composited-animation-shift.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/non-composited-animation.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/one-second-interaction.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/over-20-invalidations-per-event.json.gz
@@ -61243,6 +61251,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/relo
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/reload-no-tti.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/render-blocking-body.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/render-blocking-in-iframe.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/selector-stats-frame-test.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/selector-stats.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/server-timings.json.gz
third_party/devtools-frontend/src/front_end/panels/timeline/fixtures/traces/set-timeout-long-task.json.gz
@@ -64789,7 +64798,6 @@ third_party/hyphenation-patterns/hyb/hyph-uk.hyb
third_party/hyphenation-patterns/hyb/hyph-und-ethi.hyb
third_party/icu/cast/icudtl.dat
third_party/icu/chromeos/icudtl.dat
third_party/icu/chromeos/icudtl.dat.hash
third_party/icu/flutter/icudtl.dat
third_party/icu/flutter_desktop/icudtl.dat
third_party/icu/ios/icudtl.dat
@@ -67458,40 +67466,41 @@ 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/r8/custom_r8.jar
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/examples/hello_world.txt.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/corrupt-gz-file.bin
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/good-file.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.33/tests/multi.gz
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/testdata/fowler/dat/basic.dat
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/crash-cd33b13df59ea9d74503986f9d32a270dd43cc04
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/minimized-from-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-3ab758ea520027fefd3f00e1384d9aeef155739e
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-5345fccadf3812c53c3ccc7af5aa2741b7b2106c
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-6bd643eec330166e4ada91da2d3f284268481085
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-93c73a43581f205f9aaffd9c17e52b34b17becd0
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-9ca9cc9929fee1fcbb847a78384effb8b98ea18a
third_party/rust/chromium_crates_io/vendor/regex-1.10.6/tests/fuzz/testdata/slow-unit-b8a052f4254802edbe5f569b6ce6e9b6c927e9d6
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_dense_crash-9486fb7c8a93b12c12a62166b43d31640c0208a9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_dense_minimized-from-9486fb7c8a93b12c12a62166b43d31640c0208a9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_sparse_crash-0da59c0434eaf35e5a6b470fa9244bb79c72b000
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_sparse_crash-18cfc246f2ddfc3dfc92b0c7893178c7cf65efa9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_sparse_crash-61fd8e3003bf9d99f6c1e5a8488727eefd234b98
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_sparse_crash-a1b839d899ced76d5d7d0f78f9edb7a421505838
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_sparse_crash-c383ae07ec5e191422eadc492117439011816570
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_sparse_crash-d07703ceb94b10dcd9e4acb809f2051420449e2b
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/fuzz/testdata/deserialize_sparse_crash-dbb8172d3984e7e7d03f4b5f8bb86ecd1460eff9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/dense/multi_pattern_v2_fwd.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/dense/multi_pattern_v2_fwd.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/dense/multi_pattern_v2_rev.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/dense/multi_pattern_v2_rev.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/sparse/multi_pattern_v2_fwd.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/sparse/multi_pattern_v2_fwd.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/sparse/multi_pattern_v2_rev.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.7/tests/gen/sparse/multi_pattern_v2_rev.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.12/tests/fst/xid_continue.fst
third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.12/tests/fst/xid_start.fst
third_party/rust/chromium_crates_io/vendor/cxx-1.0.128/.cache/clangd/index/cxx.h.C0DDD5657DB570ED.idx
third_party/rust/chromium_crates_io/vendor/flate2-1.0.34/examples/hello_world.txt.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.34/tests/corrupt-gz-file.bin
third_party/rust/chromium_crates_io/vendor/flate2-1.0.34/tests/good-file.gz
third_party/rust/chromium_crates_io/vendor/flate2-1.0.34/tests/multi.gz
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/testdata/fowler/dat/basic.dat
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/crash-7eb3351f0965e5d6c1cb98aa8585949ef96531ff
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/crash-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/crash-cd33b13df59ea9d74503986f9d32a270dd43cc04
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/minimized-from-8760b19b25d74e3603d4c643e9c7404fdd3631f9
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/slow-unit-3ab758ea520027fefd3f00e1384d9aeef155739e
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/slow-unit-5345fccadf3812c53c3ccc7af5aa2741b7b2106c
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/slow-unit-6bd643eec330166e4ada91da2d3f284268481085
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/slow-unit-93c73a43581f205f9aaffd9c17e52b34b17becd0
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/slow-unit-9ca9cc9929fee1fcbb847a78384effb8b98ea18a
third_party/rust/chromium_crates_io/vendor/regex-1.11.0/tests/fuzz/testdata/slow-unit-b8a052f4254802edbe5f569b6ce6e9b6c927e9d6
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_dense_crash-9486fb7c8a93b12c12a62166b43d31640c0208a9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_dense_minimized-from-9486fb7c8a93b12c12a62166b43d31640c0208a9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_sparse_crash-0da59c0434eaf35e5a6b470fa9244bb79c72b000
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_sparse_crash-18cfc246f2ddfc3dfc92b0c7893178c7cf65efa9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_sparse_crash-61fd8e3003bf9d99f6c1e5a8488727eefd234b98
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_sparse_crash-a1b839d899ced76d5d7d0f78f9edb7a421505838
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_sparse_crash-c383ae07ec5e191422eadc492117439011816570
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_sparse_crash-d07703ceb94b10dcd9e4acb809f2051420449e2b
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/fuzz/testdata/deserialize_sparse_crash-dbb8172d3984e7e7d03f4b5f8bb86ecd1460eff9
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/gen/dense/multi_pattern_v2_fwd.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/gen/dense/multi_pattern_v2_fwd.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/gen/dense/multi_pattern_v2_rev.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/gen/dense/multi_pattern_v2_rev.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/gen/sparse/multi_pattern_v2_fwd.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/gen/sparse/multi_pattern_v2_fwd.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/gen/sparse/multi_pattern_v2_rev.bigendian.dfa
third_party/rust/chromium_crates_io/vendor/regex-automata-0.4.8/tests/gen/sparse/multi_pattern_v2_rev.littleendian.dfa
third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.13/tests/fst/xid_continue.fst
third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.13/tests/fst/xid_start.fst
third_party/rust/chromium_crates_io/vendor/windows_aarch64_msvc-0.52.6/lib/windows.0.52.0.lib
third_party/rust/chromium_crates_io/vendor/windows_i686_msvc-0.52.6/lib/windows.0.52.0.lib
third_party/rust/chromium_crates_io/vendor/windows_x86_64_msvc-0.52.6/lib/windows.0.52.0.lib
@@ -67788,12 +67797,6 @@ third_party/tflite/src/tensorflow/c/experimental/saved_model/internal/testdata/U
third_party/tflite/src/tensorflow/c/experimental/saved_model/internal/testdata/UninitializedVariable/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/c/experimental/saved_model/internal/testdata/UninitializedVariable/variables/variables.index
third_party/tflite/src/tensorflow/c/testdata/tf_record
third_party/tflite/src/tensorflow/cc/experimental/libtf/tests/testdata/data-structure-model/saved_model.pb
third_party/tflite/src/tensorflow/cc/experimental/libtf/tests/testdata/data-structure-model/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/cc/experimental/libtf/tests/testdata/data-structure-model/variables/variables.index
third_party/tflite/src/tensorflow/cc/experimental/libtf/tests/testdata/simple-model/saved_model.pb
third_party/tflite/src/tensorflow/cc/experimental/libtf/tests/testdata/simple-model/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/cc/experimental/libtf/tests/testdata/simple-model/variables/variables.index
third_party/tflite/src/tensorflow/cc/saved_model/testdata/AssetModule/saved_model.pb
third_party/tflite/src/tensorflow/cc/saved_model/testdata/AssetModule/variables/variables.data-00000-of-00001
third_party/tflite/src/tensorflow/cc/saved_model/testdata/AssetModule/variables/variables.index
@@ -68145,6 +68148,8 @@ third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/
third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/data/toys_192_192_3.jpeg
third_party/tflite/src/tensorflow/lite/experimental/acceleration/mini_benchmark/models/blazeface_mlkit_v1.tfl
third_party/tflite/src/tensorflow/lite/experimental/examples/unity/TensorFlowLitePlugin/Assets/TensorFlowLite/Examples/HelloTFLite/Scenes/add.bytes
third_party/tflite/src/tensorflow/lite/experimental/lrt/test/testdata/simple_model_pixel.bin
third_party/tflite/src/tensorflow/lite/experimental/lrt/test/testdata/simple_model_qualcomm.bin
third_party/tflite/src/tensorflow/lite/ios/testdata/extended_filename/input.a
third_party/tflite/src/tensorflow/lite/java/demo/gradle/wrapper/gradle-wrapper.jar
third_party/tflite/src/tensorflow/lite/java/ovic/demo/gradle/wrapper/gradle-wrapper.jar
@@ -68916,6 +68921,9 @@ third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_inte
third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl_system.tlb
third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_legacy_idl_user.tlb
third_party/win_build_output/midl/components/tracing/arm64/tracing_service_idl.tlb
third_party/win_build_output/midl/components/tracing/x64/tracing_service_idl.tlb
third_party/win_build_output/midl/components/tracing/x86/tracing_service_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
@@ -68969,8 +68977,6 @@ tools/grit/grit/testdata/klonk.rc
tools/grit/grit/testdata/resources.pak
tools/origin_trials/eftest.key
tools/origin_trials/eftest2.key
tools/win/ChromeDebug/ChromeDebug/Key.snk
tools/win/ChromeDebug/LowLevel/Key.snk
ui/accessibility/fuzz_corpus/ax_table_fuzzer_seed.bin
ui/display/util/fuzz_corpus/eve
ui/display/util/fuzz_corpus/hdr

9
utils/clone.py
View File

@@ -143,12 +143,17 @@ def clone(args): # pylint: disable=too-many-branches, too-many-locals, too-many-
# gn requires full history to be able to generate last_commit_position.h
get_logger().info('Cloning gn')
gn_commit = re.search(r"gn_version': 'git_revision:([^']+)',",
Path(args.output / 'DEPS').read_text()).group(1)
if not gn_commit:
get_logger().error('Unable to obtain commit for gn checkout')
sys.exit(1)
if gnpath.exists():
run(['git', 'fetch'], cwd=gnpath, check=True)
run(['git', 'reset', '--hard', 'FETCH_HEAD'], cwd=gnpath, check=True)
run(['git', 'clean', '-ffdx'], cwd=gnpath, check=True)
else:
run(['git', 'clone', "https://gn.googlesource.com/gn", str(gnpath)], check=True)
run(['git', 'reset', '--hard', gn_commit], cwd=gnpath, check=True)
run(['git', 'clean', '-ffdx'], cwd=gnpath, check=True)
get_logger().info('Running gsync')
if args.custom_config: