From 8fe8e03bb8c52fac64b52839d7af4f47b718f405 Mon Sep 17 00:00:00 2001 From: Shokara Kou Date: Wed, 8 Jun 2022 08:42:07 -0400 Subject: Revert "update ugc to 102.0.5005.61-3" This reverts commit 2be1931967e4073a55d7ac3e3ecdff7c825a63f4. --- www/chromium-uc/Makefile | 2 +- .../bromite/disable-fetching-field-trials.patch | 10 +- .../patches/core/debian/disable/unrar.patch | 24 +- .../0001-fix-building-without-safebrowsing.patch | 345 ++- .../0003-disable-autofill-download-manager.patch | 12 +- .../0005-disable-default-extensions.patch | 30 +- .../0007-disable-web-resource-service.patch | 4 +- .../0009-disable-google-ipv6-probes.patch | 6 +- .../inox-patchset/0015-disable-update-pings.patch | 6 +- .../0017-disable-new-avatar-menu.patch | 11 + .../core/inox-patchset/0021-disable-rlz.patch | 10 +- ...trk-prefixes-to-possibly-evil-connections.patch | 396 ++-- .../safe_browsing-disable-incident-reporting.patch | 26 +- ...ng-disable-reporting-of-safebrowsing-over.patch | 8 +- .../core/ungoogled-chromium/block-requests.patch | 36 +- .../block-trk-and-subdomains.patch | 120 +- .../disable-crash-reporter.patch | 6 +- .../disable-domain-reliability.patch | 44 +- .../core/ungoogled-chromium/disable-floc.patch | 78 + .../disable-fonts-googleapis-references.patch | 38 +- .../core/ungoogled-chromium/disable-gaia.patch | 9 +- .../core/ungoogled-chromium/disable-gcm.patch | 6 +- .../disable-google-host-detection.patch | 73 +- .../ungoogled-chromium/disable-mei-preload.patch | 10 +- .../disable-network-time-tracker.patch | 6 +- .../disable-privacy-sandbox.patch | 116 +- .../disable-profile-avatar-downloading.patch | 4 +- .../core/ungoogled-chromium/disable-signin.patch | 6 +- .../disable-untraceable-urls.patch | 51 +- .../disable-webrtc-log-uploader.patch | 10 +- .../ungoogled-chromium/disable-webstore-urls.patch | 93 +- .../core/ungoogled-chromium/doh-changes.patch | 76 +- .../fix-building-with-prunned-binaries.patch | 16 +- .../fix-building-without-enabling-reporting.patch | 215 ++ .../fix-building-without-one-click-signin.patch | 16 +- .../fix-building-without-safebrowsing.patch | 1200 +++++------ .../fix-learn-doubleclick-hsts.patch | 4 +- .../remove-unused-preferences-fields.patch | 2243 +++++++++----------- ...eplace-google-search-engine-with-nosearch.patch | 11 +- .../toggle-translation-via-switch.patch | 28 +- ...inting-flags-client-rects-and-measuretext.patch | 138 +- ...ag-fingerprinting-canvas-image-data-noise.patch | 68 +- .../bromite/flag-max-connections-per-host.patch | 60 +- .../extra/debian/disable/google-api-warning.patch | 6 +- .../extra/debian/disable/welcome-page.patch | 8 +- .../extra/debian/fixes/connection-message.patch | 4 +- .../patches/extra/debian/gn/parallel.patch | 4 +- .../inox-patchset/0006-modify-default-prefs.patch | 125 +- .../inox-patchset/0008-restore-classic-ntp.patch | 14 +- .../0013-disable-missing-key-warning.patch | 4 +- .../inox-patchset/0016-chromium-sandbox-pie.patch | 6 +- .../0018-disable-first-run-behaviour.patch | 6 +- .../0019-disable-battery-status-service.patch | 10 +- .../iridium-browser/Remove-EV-certificates.patch | 26 +- ...-disable-profile-auto-import-on-first-run.patch | 14 +- ...il-force-text-x-suse-ymp-to-be-downloaded.patch | 4 +- ...crease-default-key-length-for-newly-gener.patch | 6 +- ...s-prompt-for-download-directory-by-defaul.patch | 6 +- .../prefs-only-keep-cookies-until-exit.patch | 10 +- .../updater-disable-auto-update.patch | 6 +- .../add-components-ungoogled.patch | 14 +- .../add-extra-channel-info.patch | 4 +- .../add-flag-for-bookmark-bar-ntp.patch | 26 +- .../add-flag-for-close-confirmation.patch | 36 +- .../add-flag-for-custom-ntp.patch | 24 +- .../add-flag-for-grab-handle.patch | 12 +- ...d-flag-for-omnibox-autocomplete-filtering.patch | 32 +- .../add-flag-for-pdf-plugin-name.patch | 389 ++++ .../add-flag-for-qr-generator.patch | 34 +- .../add-flag-for-referrer-header.patch | 66 - .../add-flag-for-search-engine-collection.patch | 42 +- .../add-flag-for-tab-hover-cards.patch | 34 +- .../add-flag-for-tabsearch-button.patch | 26 +- .../add-flag-to-change-http-accept-header.patch | 49 - .../add-flag-to-clear-data-on-exit.patch | 36 +- .../add-flag-to-close-window-with-last-tab.patch | 20 +- ...d-flag-to-configure-extension-downloading.patch | 36 +- .../add-flag-to-convert-popups-to-tabs.patch | 27 +- .../add-flag-to-disable-beforeunload.patch | 14 +- ...-flag-to-disable-local-history-expiration.patch | 12 +- .../add-flag-to-disable-tls-grease.patch | 23 - .../add-flag-to-force-punycode-hostnames.patch | 16 +- .../add-flag-to-hide-crashed-bubble.patch | 20 +- .../add-flag-to-hide-tab-close-buttons.patch | 38 +- .../add-flag-to-scroll-tabs.patch | 26 +- .../add-flag-to-show-avatar-button.patch | 18 +- .../add-flag-to-stack-tabs.patch | 33 + .../add-ipv6-probing-option.patch | 32 +- .../add-suggestions-url-field.patch | 132 +- .../add-ungoogled-flag-headers.patch | 18 +- .../disable-dial-repeating-discovery.patch | 18 +- .../disable-download-quarantine.patch | 81 +- .../disable-formatting-in-omnibox.patch | 6 +- .../disable-intranet-redirect-detector.patch | 4 +- .../disable-remote-optimization-guide.patch | 11 - .../disable-webgl-renderer-info.patch | 8 +- .../enable-default-prefetch-privacy-changes.patch | 6 +- .../enable-menu-on-reload-button.patch | 6 +- .../enable-page-saving-on-more-pages.patch | 29 +- .../enable-paste-and-go-new-tab-button.patch | 16 +- ...ilding-without-mdns-and-service-discovery.patch | 4 +- .../ungoogled-chromium/fix-distilled-icons.patch | 4 +- .../ungoogled-chromium/keep-expired-flags.patch | 8 +- .../prepopulated-search-engines.patch | 10 +- ...remove-disable-setuid-sandbox-as-bad-flag.patch | 6 +- .../ungoogled-chromium/remove-uneeded-ui.patch | 185 +- 106 files changed, 4024 insertions(+), 3597 deletions(-) create mode 100644 www/chromium-uc/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch create mode 100644 www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch create mode 100644 www/chromium-uc/patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch create mode 100644 www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch delete mode 100644 www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-for-referrer-header.patch delete mode 100644 www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-change-http-accept-header.patch delete mode 100644 www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-disable-tls-grease.patch create mode 100644 www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch delete mode 100644 www/chromium-uc/patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch diff --git a/www/chromium-uc/Makefile b/www/chromium-uc/Makefile index 5e3b1ae..f52c0c8 100644 --- a/www/chromium-uc/Makefile +++ b/www/chromium-uc/Makefile @@ -8,7 +8,7 @@ DPB_PROPERTIES= parallel parallel2 COMMENT= Chromium browser -V= 102.0.5005.61 +V= 96.0.4664.110 REVISION= 1 diff --git a/www/chromium-uc/patches/core/bromite/disable-fetching-field-trials.patch b/www/chromium-uc/patches/core/bromite/disable-fetching-field-trials.patch index 4e81932..ebb9aec 100644 --- a/www/chromium-uc/patches/core/bromite/disable-fetching-field-trials.patch +++ b/www/chromium-uc/patches/core/bromite/disable-fetching-field-trials.patch @@ -8,8 +8,8 @@ Subject: Disable fetching of all field trials .../variations/service/variations_service.cc | 12 +----------- 2 files changed, 5 insertions(+), 26 deletions(-) ---- 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 +--- chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java.orig ++++ chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java @@ -105,11 +105,7 @@ public abstract class ChromeFeatureList * the specified parameter does not exist. */ @@ -65,9 +65,9 @@ Subject: Disable fetching of all field trials } /* Alphabetical: */ ---- a/components/variations/service/variations_service.cc -+++ b/components/variations/service/variations_service.cc -@@ -235,17 +235,7 @@ bool GetInstanceManipulations(const net: +--- components/variations/service/variations_service.cc.orig ++++ components/variations/service/variations_service.cc +@@ -238,17 +238,7 @@ bool GetInstanceManipulations(const net: // Variations seed fetching is only enabled in official Chrome builds, if a URL // is specified on the command line, and for testing. bool IsFetchingEnabled() { diff --git a/www/chromium-uc/patches/core/debian/disable/unrar.patch b/www/chromium-uc/patches/core/debian/disable/unrar.patch index 6657559..a87c2a8 100644 --- a/www/chromium-uc/patches/core/debian/disable/unrar.patch +++ b/www/chromium-uc/patches/core/debian/disable/unrar.patch @@ -2,19 +2,19 @@ description: disable support for safe browsing inspection of rar files author: Michael Gilbert bug: http://bugs.debian.org/914487 ---- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc -+++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc -@@ -96,7 +96,7 @@ void FileAnalyzer::Start(const base::Fil +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig ++++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc +@@ -95,7 +95,7 @@ void FileAnalyzer::Start(const base::Fil if (inspection_type == DownloadFileType::ZIP) { StartExtractZipFeatures(); } else if (inspection_type == DownloadFileType::RAR) { - StartExtractRarFeatures(); + LOG(WARNING) << "Safebrowser inspection of rar files is disabled in this build"; - #if BUILDFLAG(IS_MAC) + #if defined(OS_MAC) } else if (inspection_type == DownloadFileType::DMG) { StartExtractDmgFeatures(); ---- a/chrome/common/safe_browsing/BUILD.gn -+++ b/chrome/common/safe_browsing/BUILD.gn +--- chrome/common/safe_browsing/BUILD.gn.orig ++++ chrome/common/safe_browsing/BUILD.gn @@ -58,39 +58,6 @@ if (safe_browsing_mode == 1) { public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ] } @@ -63,17 +63,17 @@ bug: http://bugs.debian.org/914487 "//components/safe_browsing/core/common", ] ---- a/chrome/services/file_util/safe_archive_analyzer.cc -+++ b/chrome/services/file_util/safe_archive_analyzer.cc -@@ -6,7 +6,6 @@ - +--- chrome/services/file_util/safe_archive_analyzer.cc.orig ++++ chrome/services/file_util/safe_archive_analyzer.cc +@@ -7,7 +7,6 @@ + #include "base/macros.h" #include "build/build_config.h" #include "chrome/common/safe_browsing/archive_analyzer_results.h" -#include "chrome/common/safe_browsing/rar_analyzer.h" #include "chrome/common/safe_browsing/zip_analyzer.h" - #if BUILDFLAG(IS_MAC) -@@ -46,8 +45,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile + #if defined(OS_MAC) +@@ -47,8 +46,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile AnalyzeRarFileCallback callback) { DCHECK(rar_file.IsValid()); diff --git a/www/chromium-uc/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch b/www/chromium-uc/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch index 2154f6f..18fc72a 100644 --- a/www/chromium-uc/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch +++ b/www/chromium-uc/patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -1,6 +1,6 @@ ---- a/chrome/browser/BUILD.gn -+++ b/chrome/browser/BUILD.gn -@@ -2214,7 +2214,6 @@ static_library("browser") { +--- chrome/browser/BUILD.gn.orig ++++ chrome/browser/BUILD.gn +@@ -2195,7 +2195,6 @@ static_library("browser") { "//components/reputation/core:proto", "//components/resources", "//components/safe_browsing/content/browser", @@ -8,7 +8,7 @@ "//components/safe_browsing/content/browser:safe_browsing_service", "//components/safe_browsing/content/browser/password_protection", "//components/safe_browsing/content/browser/web_ui", -@@ -3754,8 +3753,6 @@ static_library("browser") { +@@ -3706,8 +3705,6 @@ static_library("browser") { "download/download_commands.h", "download/download_crx_util.cc", "download/download_crx_util.h", @@ -17,9 +17,9 @@ "download/download_dir_policy_handler.cc", "download/download_dir_policy_handler.h", "download/download_dir_util.cc", ---- a/chrome/browser/browser_process.h -+++ b/chrome/browser/browser_process.h -@@ -54,10 +54,6 @@ class NetworkQualityTracker; +--- chrome/browser/browser_process.h.orig ++++ chrome/browser/browser_process.h +@@ -55,10 +55,6 @@ class NetworkQualityTracker; class SharedURLLoaderFactory; } @@ -30,7 +30,7 @@ namespace subresource_filter { class RulesetService; } -@@ -210,9 +206,6 @@ class BrowserProcess { +@@ -218,9 +214,6 @@ class BrowserProcess { // on this platform (or this is a unit test). virtual StatusTray* status_tray() = 0; @@ -40,9 +40,9 @@ // Returns the service providing versioned storage for rules used by the Safe // Browsing subresource filter. virtual subresource_filter::RulesetService* ---- a/chrome/browser/browser_process_impl.cc -+++ b/chrome/browser/browser_process_impl.cc -@@ -71,7 +71,6 @@ +--- chrome/browser/browser_process_impl.cc.orig ++++ chrome/browser/browser_process_impl.cc +@@ -70,7 +70,6 @@ #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" @@ -50,7 +50,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/site_isolation/prefs_observer.h" #include "chrome/browser/ssl/secure_origin_prefs_observer.h" -@@ -394,8 +393,6 @@ void BrowserProcessImpl::StartTearDown() +@@ -395,8 +394,6 @@ void BrowserProcessImpl::StartTearDown() metrics_services_manager_.reset(); intranet_redirect_detector_.reset(); @@ -59,7 +59,7 @@ network_time_tracker_.reset(); #if BUILDFLAG(ENABLE_PLUGINS) plugins_resource_service_.reset(); -@@ -1029,14 +1026,6 @@ StatusTray* BrowserProcessImpl::status_t +@@ -1030,14 +1027,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_); -@@ -1283,26 +1272,6 @@ void BrowserProcessImpl::CreateBackgroun +@@ -1300,26 +1289,6 @@ void BrowserProcessImpl::CreateBackgroun #endif } @@ -101,17 +101,17 @@ void BrowserProcessImpl::CreateSubresourceFilterRulesetService() { DCHECK(!subresource_filter_ruleset_service_); created_subresource_filter_ruleset_service_ = true; ---- a/chrome/browser/browser_process_impl.h -+++ b/chrome/browser/browser_process_impl.h -@@ -188,7 +188,6 @@ class BrowserProcessImpl : public Browse +--- chrome/browser/browser_process_impl.h.orig ++++ chrome/browser/browser_process_impl.h +@@ -190,7 +190,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr manager) override; #endif StatusTray* status_tray() override; - safe_browsing::SafeBrowsingService* safe_browsing_service() override; subresource_filter::RulesetService* subresource_filter_ruleset_service() override; - -@@ -335,9 +334,6 @@ class BrowserProcessImpl : public Browse + federated_learning::FlocSortingLshClustersService* +@@ -344,9 +343,6 @@ class BrowserProcessImpl : public Browse std::unique_ptr background_mode_manager_; #endif @@ -121,17 +121,17 @@ bool created_subresource_filter_ruleset_service_ = false; std::unique_ptr subresource_filter_ruleset_service_; ---- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -@@ -66,7 +66,6 @@ - #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h" - #include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h" +--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.orig ++++ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +@@ -70,7 +70,6 @@ #include "chrome/browser/profiles/profile.h" + #include "chrome/browser/profiles/profile_keep_alive_types.h" + #include "chrome/browser/profiles/scoped_profile_keep_alive.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" - #include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/share/share_history.h" -@@ -617,10 +616,6 @@ void ChromeBrowsingDataRemoverDelegate:: + #include "chrome/browser/share/share_ranking.h" +@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate:: base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies")); network::mojom::NetworkContext* safe_browsing_context = nullptr; @@ -140,11 +140,11 @@ - if (sb_service) - safe_browsing_context = sb_service->GetNetworkContext(profile_); - browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_, - host_content_settings_map_); ---- a/chrome/browser/chrome_content_browser_client.cc -+++ b/chrome/browser/chrome_content_browser_client.cc -@@ -959,34 +959,6 @@ void SetApplicationLocaleOnIOThread(cons + browsing_data::RemoveEmbedderCookieData( + delete_begin, delete_end, filter_builder, host_content_settings_map_, +--- chrome/browser/chrome_content_browser_client.cc.orig ++++ chrome/browser/chrome_content_browser_client.cc +@@ -921,34 +921,6 @@ void SetApplicationLocaleOnIOThread(cons GetIOThreadApplicationLocale() = locale; } @@ -173,13 +173,13 @@ - } - - private: -- raw_ptr service_; +- CertificateReportingService* service_; -}; - #if BUILDFLAG(ENABLE_EXTENSIONS) AppLoadedInTabSource ClassifyAppLoadedInTabSource( -@@ -1495,7 +1467,6 @@ void ChromeContentBrowserClient::PostAft +@@ -1423,7 +1395,6 @@ void ChromeContentBrowserClient::PostAft InitNetworkContextsParentDirectory(); DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -187,15 +187,8 @@ } bool ChromeContentBrowserClient::IsBrowserStartupComplete() { -@@ -4290,14 +4261,9 @@ ChromeContentBrowserClient::CreateThrott - throttles.push_back(std::make_unique( - handle, handle->GetWebContents()->GetBrowserContext())); - -- // Before setting up SSL error detection, configure SSLErrorHandler to invoke -- // the relevant extension API whenever an SSL interstitial is shown. -- SSLErrorHandler::SetClientCallbackOnInterstitialsShown( -- base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent)); -- content::WebContents* web_contents = handle->GetWebContents(); +@@ -4229,7 +4200,7 @@ ChromeContentBrowserClient::CreateThrott + content::WebContents* web_contents = handle->GetWebContents(); throttles.push_back(std::make_unique( handle, - std::make_unique(web_contents), @@ -203,7 +196,7 @@ base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp), base::BindOnce( &ShouldIgnoreSslInterstitialBecauseNavigationDefaultedToHttps))); -@@ -4332,16 +4298,6 @@ ChromeContentBrowserClient::CreateThrott +@@ -4258,15 +4229,6 @@ ChromeContentBrowserClient::CreateThrott &throttles); #endif @@ -212,17 +205,16 @@ - g_browser_process->safe_browsing_service() - ? g_browser_process->safe_browsing_service()->ui_manager().get() - : nullptr; -- MaybeAddThrottle( -- safe_browsing::SafeBrowsingNavigationThrottle::MaybeCreateThrottleFor( -- handle, ui_manager), -- &throttles); +- throttles.push_back( +- std::make_unique( +- handle, ui_manager)); - if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { throttles.push_back( std::make_unique( ---- a/chrome/browser/component_updater/file_type_policies_component_installer.cc -+++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc -@@ -39,20 +39,6 @@ const uint8_t kFileTypePoliciesPublicKey +--- chrome/browser/component_updater/file_type_policies_component_installer.cc.orig ++++ chrome/browser/component_updater/file_type_policies_component_installer.cc +@@ -40,20 +40,6 @@ const uint8_t kFileTypePoliciesPublicKey const char kFileTypePoliciesManifestName[] = "File Type Policies"; void LoadFileTypesFromDisk(const base::FilePath& pb_path) { @@ -243,9 +235,9 @@ } } // namespace ---- a/chrome/browser/download/chrome_download_manager_delegate.cc -+++ b/chrome/browser/download/chrome_download_manager_delegate.cc -@@ -430,13 +430,6 @@ ChromeDownloadManagerDelegate::~ChromeDo +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig ++++ chrome/browser/download/chrome_download_manager_delegate.cc +@@ -436,13 +436,6 @@ ChromeDownloadManagerDelegate::~ChromeDo void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { download_manager_ = dm; @@ -258,16 +250,15 @@ - } } - #if BUILDFLAG(IS_ANDROID) -@@ -790,17 +783,6 @@ void ChromeDownloadManagerDelegate::Choo + #if defined(OS_ANDROID) +@@ -791,16 +784,6 @@ void ChromeDownloadManagerDelegate::Choo + void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( - base::FilePath* filename, - const GURL& source_url) { + base::FilePath* filename) { - safe_browsing::FileTypePolicies* file_type_policies = - safe_browsing::FileTypePolicies::GetInstance(); - -- const PrefService* prefs = profile_->GetPrefs(); -- if (file_type_policies->GetFileDangerLevel(*filename, source_url, prefs) == +- if (file_type_policies->GetFileDangerLevel(*filename) == - safe_browsing::DownloadFileType::NOT_DANGEROUS) - return; - @@ -277,9 +268,9 @@ } void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( ---- a/chrome/browser/download/download_item_model.cc -+++ b/chrome/browser/download/download_item_model.cc -@@ -89,7 +89,7 @@ class DownloadItemModelData : public bas +--- chrome/browser/download/download_item_model.cc.orig ++++ chrome/browser/download/download_item_model.cc +@@ -86,7 +86,7 @@ class DownloadItemModelData : public bas // Danger level of the file determined based on the file type and whether // there was a user action associated with the download. @@ -288,7 +279,7 @@ // Whether the download is currently being revived. bool is_being_revived_; -@@ -126,7 +126,7 @@ DownloadItemModelData::DownloadItemModel +@@ -123,7 +123,7 @@ DownloadItemModelData::DownloadItemModel : should_show_in_shelf_(true), was_ui_notified_(false), should_prefer_opening_in_browser_(false), @@ -297,7 +288,7 @@ is_being_revived_(false) {} } // namespace -@@ -417,13 +417,13 @@ void DownloadItemModel::SetShouldPreferO +@@ -381,13 +381,13 @@ void DownloadItemModel::SetShouldPreferO data->should_prefer_opening_in_browser_ = preference; } @@ -314,7 +305,7 @@ DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); data->danger_level_ = danger_level; } -@@ -643,9 +643,6 @@ bool DownloadItemModel::IsCommandEnabled +@@ -599,9 +599,6 @@ bool DownloadItemModel::IsCommandEnabled // filename. Don't base an "Always open" decision based on it. Also // exclude extensions. return download_->CanOpenDownload() && @@ -324,9 +315,9 @@ !download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::PAUSE: return !download_->IsSavePackageDownload() && ---- a/chrome/browser/download/download_prefs.cc -+++ b/chrome/browser/download/download_prefs.cc -@@ -252,14 +252,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr +--- chrome/browser/download/download_prefs.cc.orig ++++ chrome/browser/download/download_prefs.cc +@@ -260,14 +260,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + extension); @@ -342,7 +333,7 @@ } } -@@ -479,10 +472,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c +@@ -475,10 +468,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( const base::FilePath& file_name) { base::FilePath::StringType extension = file_name.Extension(); @@ -353,8 +344,8 @@ DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); ---- a/chrome/browser/download/download_target_determiner.cc -+++ b/chrome/browser/download/download_target_determiner.cc +--- chrome/browser/download/download_target_determiner.cc.orig ++++ chrome/browser/download/download_target_determiner.cc @@ -297,13 +297,6 @@ base::FilePath DownloadTargetDeterminer: download_->GetURL(), download_->GetContentDisposition(), referrer_charset, suggested_filename, sniffed_mime_type, default_filename); @@ -369,14 +360,13 @@ // If no mime type or explicitly specified a name, don't replace file // extension. if (sniffed_mime_type.empty() || !suggested_filename.empty()) -@@ -1124,30 +1117,7 @@ DownloadFileType::DangerLevel DownloadTa +@@ -1113,29 +1106,7 @@ DownloadFileType::DangerLevel DownloadTa download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; - DownloadFileType::DangerLevel danger_level = - safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( -- virtual_path_.BaseName(), download_->GetURL(), -- GetProfile()->GetPrefs()); +- virtual_path_.BaseName()); - - // A danger level of ALLOW_ON_USER_GESTURE is used to label potentially - // dangerous file types that have a high frequency of legitimate use. We would @@ -401,8 +391,8 @@ } absl::optional ---- a/chrome/browser/extensions/api/downloads/downloads_api.cc -+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc +--- chrome/browser/extensions/api/downloads/downloads_api.cc.orig ++++ chrome/browser/extensions/api/downloads/downloads_api.cc @@ -36,7 +36,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_core_service.h" @@ -411,7 +401,7 @@ #include "chrome/browser/download/download_file_icon_extractor.h" #include "chrome/browser/download/download_open_prompt.h" #include "chrome/browser/download/download_prefs.h" -@@ -1277,9 +1276,6 @@ DownloadsAcceptDangerFunction::Downloads +@@ -1274,9 +1273,6 @@ DownloadsAcceptDangerFunction::Downloads DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} @@ -421,7 +411,7 @@ ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { std::unique_ptr params( downloads::AcceptDanger::Params::Create(args())); -@@ -1317,42 +1313,7 @@ void DownloadsAcceptDangerFunction::Prom +@@ -1314,42 +1310,7 @@ void DownloadsAcceptDangerFunction::Prom return; } RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); @@ -465,10 +455,10 @@ } DownloadsShowFunction::DownloadsShowFunction() {} ---- a/chrome/browser/extensions/api/downloads/downloads_api.h -+++ b/chrome/browser/extensions/api/downloads/downloads_api.h +--- chrome/browser/extensions/api/downloads/downloads_api.h.orig ++++ chrome/browser/extensions/api/downloads/downloads_api.h @@ -13,7 +13,6 @@ - #include "base/memory/raw_ptr.h" + #include "base/macros.h" #include "base/scoped_observation.h" #include "base/time/time.h" -#include "chrome/browser/download/download_danger_prompt.h" @@ -503,8 +493,8 @@ }; class DownloadsShowFunction : public ExtensionFunction { ---- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc -+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc +--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc.orig ++++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc @@ -54,38 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunct base::StringPrintf("Could not find tab with id %d.", params->tab_id))); } @@ -520,8 +510,8 @@ - - safe_browsing::ReferrerChain referrer_chain; - SafeBrowsingNavigationObserverManager::AttributionResult result = -- navigation_observer_manager->IdentifyReferrerChainByRenderFrameHost( -- contents->GetMainFrame(), kReferrerUserGestureLimit, &referrer_chain); +- navigation_observer_manager->IdentifyReferrerChainByWebContents( +- contents, kReferrerUserGestureLimit, &referrer_chain); - - // If the referrer chain is incomplete we'll append the most recent - // navigations to referrer chain for diagnostic purposes. This only happens if @@ -544,9 +534,9 @@ return RespondNow(ArgumentList( api::safe_browsing_private::GetReferrerChain::Results::Create( referrer_entries))); ---- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc -@@ -721,18 +721,6 @@ void WebstorePrivateBeginInstallWithMani +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.orig ++++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +@@ -683,18 +683,6 @@ void WebstorePrivateBeginInstallWithMani void WebstorePrivateBeginInstallWithManifest3Function:: ReportFrictionAcceptedEvent() { @@ -565,7 +555,7 @@ } void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone( -@@ -1202,55 +1190,9 @@ WebstorePrivateGetReferrerChainFunction: +@@ -1159,52 +1147,9 @@ WebstorePrivateGetReferrerChainFunction: ExtensionFunction::ResponseAction WebstorePrivateGetReferrerChainFunction::Run() { @@ -575,11 +565,8 @@ - return RespondNow(ArgumentList( - api::webstore_private::GetReferrerChain::Results::Create(""))); - -- content::RenderFrameHost* rfh = render_frame_host(); -- content::RenderFrameHost* outermost_rfh = -- rfh ? rfh->GetOutermostMainFrame() : nullptr; -- -- if (!outermost_rfh) { +- content::WebContents* web_contents = GetSenderWebContents(); +- if (!web_contents) { - return RespondNow(ErrorWithArguments( - api::webstore_private::GetReferrerChain::Results::Create(""), - kWebstoreUserCancelledError)); @@ -591,8 +578,8 @@ - - safe_browsing::ReferrerChain referrer_chain; - SafeBrowsingNavigationObserverManager::AttributionResult result = -- navigation_observer_manager->IdentifyReferrerChainByRenderFrameHost( -- outermost_rfh, kExtensionReferrerUserGestureLimit, &referrer_chain); +- navigation_observer_manager->IdentifyReferrerChainByWebContents( +- web_contents, kExtensionReferrerUserGestureLimit, &referrer_chain); - - // If the referrer chain is incomplete we'll append the most recent - // navigations to referrer chain for diagnostic purposes. This only happens if @@ -622,9 +609,9 @@ } WebstorePrivateGetExtensionStatusFunction:: ---- a/chrome/browser/extensions/blocklist_state_fetcher.cc -+++ b/chrome/browser/extensions/blocklist_state_fetcher.cc -@@ -38,23 +38,8 @@ BlocklistStateFetcher::~BlocklistStateFe +--- chrome/browser/extensions/blocklist_state_fetcher.cc.orig ++++ chrome/browser/extensions/blocklist_state_fetcher.cc +@@ -34,33 +34,8 @@ BlocklistStateFetcher::~BlocklistStateFe void BlocklistStateFetcher::Request(const std::string& id, RequestCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -644,13 +631,23 @@ - if (request_already_sent) - return; - +- if (g_browser_process && g_browser_process->safe_browsing_service()) { +- if (base::FeatureList::IsEnabled( +- safe_browsing::kSafeBrowsingRemoveCookies)) { +- url_loader_factory_ = g_browser_process->shared_url_loader_factory(); +- } else { +- url_loader_factory_ = +- g_browser_process->safe_browsing_service()->GetURLLoaderFactory(); +- } +- } +- - SendRequest(id); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), BLOCKLISTED_UNKNOWN)); } void BlocklistStateFetcher::SendRequest(const std::string& id) { -@@ -65,8 +50,7 @@ void BlocklistStateFetcher::SendRequest( +@@ -71,8 +46,7 @@ void BlocklistStateFetcher::SendRequest( std::string request_str; request.SerializeToString(&request_str); @@ -660,7 +657,7 @@ net::NetworkTrafficAnnotationTag traffic_annotation = net::DefineNetworkTrafficAnnotation("extension_blacklist", R"( semantics { -@@ -114,12 +98,6 @@ void BlocklistStateFetcher::SendRequest( +@@ -122,12 +96,6 @@ void BlocklistStateFetcher::SendRequest( base::Unretained(this), fetcher)); } @@ -673,9 +670,9 @@ void BlocklistStateFetcher::OnURLLoaderComplete( network::SimpleURLLoader* url_loader, std::unique_ptr response_body) { ---- a/chrome/browser/extensions/blocklist_state_fetcher.h -+++ b/chrome/browser/extensions/blocklist_state_fetcher.h -@@ -36,8 +36,6 @@ class BlocklistStateFetcher { +--- chrome/browser/extensions/blocklist_state_fetcher.h.orig ++++ chrome/browser/extensions/blocklist_state_fetcher.h +@@ -37,8 +37,6 @@ class BlocklistStateFetcher { virtual void Request(const std::string& id, RequestCallback callback); @@ -684,7 +681,7 @@ protected: void OnURLLoaderComplete(network::SimpleURLLoader* url_loader, std::unique_ptr response_body); -@@ -56,7 +54,6 @@ class BlocklistStateFetcher { +@@ -57,7 +55,6 @@ class BlocklistStateFetcher { void SendRequest(const std::string& id); @@ -692,21 +689,21 @@ scoped_refptr url_loader_factory_; // SimpleURLLoader -> (owned loader, extension id). ---- a/chrome/browser/metrics/chrome_metrics_service_client.cc -+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -861,9 +861,6 @@ void ChromeMetricsServiceClient::Registe +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig ++++ chrome/browser/metrics/chrome_metrics_service_client.cc +@@ -828,9 +828,6 @@ void ChromeMetricsServiceClient::Registe metrics_service_->RegisterMetricsProvider( std::make_unique()); - metrics_service_->RegisterMetricsProvider( - std::make_unique()); - - #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) + #if !defined(OS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) metrics_service_->RegisterMetricsProvider( std::make_unique()); ---- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc -+++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc -@@ -137,9 +137,6 @@ void TrialComparisonCertVerifierControll +--- chrome/browser/net/trial_comparison_cert_verifier_controller.cc.orig ++++ chrome/browser/net/trial_comparison_cert_verifier_controller.cc +@@ -138,9 +138,6 @@ void TrialComparisonCertVerifierControll std::string serialized_report; if (!report.Serialize(&serialized_report)) return; @@ -716,19 +713,19 @@ } // static ---- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -324,7 +324,6 @@ void ChromeBrowserMainExtraPartsProfiles +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig ++++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +@@ -297,7 +297,6 @@ void ChromeBrowserMainExtraPartsProfiles #if BUILDFLAG(IS_CHROMEOS_LACROS) CertDbInitializerFactory::GetInstance(); #endif - CertificateReportingServiceFactory::GetInstance(); - #if !BUILDFLAG(IS_ANDROID) + #if !defined(OS_ANDROID) ChromeBrowsingDataLifetimeManagerFactory::GetInstance(); #endif ---- a/chrome/browser/profiles/profile_impl.cc -+++ b/chrome/browser/profiles/profile_impl.cc -@@ -91,7 +91,6 @@ +--- chrome/browser/profiles/profile_impl.cc.orig ++++ chrome/browser/profiles/profile_impl.cc +@@ -93,7 +93,6 @@ #include "chrome/browser/profiles/profile_metrics.h" #include "chrome/browser/push_messaging/push_messaging_service_factory.h" #include "chrome/browser/push_messaging/push_messaging_service_impl.h" @@ -736,7 +733,7 @@ #include "chrome/browser/sessions/exit_type_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/browser/signin/identity_manager_factory.h" -@@ -623,17 +622,6 @@ void ProfileImpl::LoadPrefsForNormalStar +@@ -627,17 +626,6 @@ void ProfileImpl::LoadPrefsForNormalStar mojo::PendingRemote pref_validation_delegate; @@ -754,9 +751,9 @@ prefs_ = CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), ---- a/chrome/browser/profiles/profiles_state.cc -+++ b/chrome/browser/profiles/profiles_state.cc -@@ -255,9 +255,6 @@ void RemoveBrowsingDataForProfile(const +--- chrome/browser/profiles/profiles_state.cc.orig ++++ chrome/browser/profiles/profiles_state.cc +@@ -259,9 +259,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. @@ -766,9 +763,9 @@ Profile* profile = g_browser_process->profile_manager()->GetProfileByPath(profile_path); if (!profile) ---- a/chrome/browser/safe_browsing/BUILD.gn -+++ b/chrome/browser/safe_browsing/BUILD.gn -@@ -6,6 +6,7 @@ import("//components/safe_browsing/build +--- chrome/browser/safe_browsing/BUILD.gn.orig ++++ chrome/browser/safe_browsing/BUILD.gn +@@ -5,6 +5,7 @@ import("//components/safe_browsing/build import("//extensions/buildflags/buildflags.gni") static_library("safe_browsing") { @@ -776,7 +773,7 @@ sources = [ "chrome_controller_client.cc", "chrome_controller_client.h", -@@ -91,6 +92,7 @@ static_library("safe_browsing") { +@@ -88,6 +89,7 @@ static_library("safe_browsing") { "//extensions/browser", ] } @@ -784,7 +781,7 @@ if (safe_browsing_mode != 0) { # "Safe Browsing Basic" files used for safe browsing in full mode -@@ -455,6 +457,7 @@ static_library("advanced_protection") { +@@ -411,6 +413,7 @@ static_library("advanced_protection") { } source_set("metrics_collector") { @@ -792,7 +789,7 @@ sources = [ "safe_browsing_metrics_collector_factory.cc", "safe_browsing_metrics_collector_factory.h", -@@ -472,6 +475,7 @@ source_set("metrics_collector") { +@@ -428,6 +431,7 @@ source_set("metrics_collector") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//content/public/browser", ] @@ -800,9 +797,9 @@ } source_set("test_support") { ---- a/chrome/browser/ssl/security_state_tab_helper.cc -+++ b/chrome/browser/ssl/security_state_tab_helper.cc -@@ -180,89 +180,6 @@ bool SecurityStateTabHelper::UsedPolicyI +--- chrome/browser/ssl/security_state_tab_helper.cc.orig ++++ chrome/browser/ssl/security_state_tab_helper.cc +@@ -217,89 +217,6 @@ bool SecurityStateTabHelper::UsedPolicyI security_state::MaliciousContentStatus SecurityStateTabHelper::GetMaliciousContentStatus() const { @@ -842,7 +839,7 @@ - MALICIOUS_CONTENT_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE; - } -#endif -- [[fallthrough]]; +- FALLTHROUGH; - case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE: -#if BUILDFLAG(FULL_SAFE_BROWSING) - if (safe_browsing::ChromePasswordProtectionService:: @@ -852,7 +849,7 @@ - MALICIOUS_CONTENT_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE; - } -#endif -- [[fallthrough]]; +- FALLTHROUGH; - case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE: -#if BUILDFLAG(FULL_SAFE_BROWSING) - if (safe_browsing::ChromePasswordProtectionService:: @@ -892,19 +889,19 @@ return security_state::MALICIOUS_CONTENT_STATUS_NONE; } ---- a/chrome/browser/ui/BUILD.gn -+++ b/chrome/browser/ui/BUILD.gn -@@ -4219,7 +4219,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", +--- chrome/browser/ui/BUILD.gn.orig ++++ chrome/browser/ui/BUILD.gn +@@ -3946,7 +3946,6 @@ static_library("ui") { + "views/device_chooser_content_view.h", + "views/devtools_process_observer.cc", + "views/devtools_process_observer.h", - "views/download/download_danger_prompt_views.cc", "views/download/download_in_progress_dialog_view.cc", "views/download/download_in_progress_dialog_view.h", "views/download/download_item_view.cc", ---- a/chrome/browser/ui/tab_helpers.cc -+++ b/chrome/browser/ui/tab_helpers.cc -@@ -390,22 +390,6 @@ void TabHelpers::AttachTabHelpers(WebCon +--- chrome/browser/ui/tab_helpers.cc.orig ++++ chrome/browser/ui/tab_helpers.cc +@@ -330,16 +330,6 @@ void TabHelpers::AttachTabHelpers(WebCon // See https://crbug.com/910288. resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( web_contents); @@ -913,12 +910,6 @@ - safe_browsing::SafeBrowsingNavigationObserverManagerFactory:: - GetForBrowserContext(profile), - profile->GetPrefs(), g_browser_process->safe_browsing_service()); -- if (base::FeatureList::IsEnabled( -- safe_browsing::kTailoredSecurityIntegration)) { -- safe_browsing::TailoredSecurityUrlObserver::CreateForWebContents( -- web_contents, -- safe_browsing::TailoredSecurityServiceFactory::GetForProfile(profile)); -- } - safe_browsing::SafeBrowsingTabObserver::CreateForWebContents( - web_contents, - std::make_unique()); @@ -927,8 +918,8 @@ ReputationWebContentsObserver::CreateForWebContents(web_contents); SearchEngineTabHelper::CreateForWebContents(web_contents); SecurityStateTabHelper::CreateForWebContents(web_contents); ---- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc -+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.orig ++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc @@ -23,7 +23,6 @@ #include "base/threading/thread.h" #include "base/values.h" @@ -937,7 +928,7 @@ #include "chrome/browser/download/download_history.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_prefs.h" -@@ -172,9 +171,6 @@ void DownloadsDOMHandler::SaveDangerousR +@@ -171,9 +170,6 @@ void DownloadsDOMHandler::SaveDangerousR } CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); @@ -947,7 +938,7 @@ } void DownloadsDOMHandler::AcceptIncognitoWarning(const std::string& id) { -@@ -326,12 +322,6 @@ void DownloadsDOMHandler::RemoveDownload +@@ -325,12 +321,6 @@ void DownloadsDOMHandler::RemoveDownload IdSet ids; for (auto* download : to_remove) { @@ -960,7 +951,7 @@ DownloadItemModel item_model(download); if (!item_model.ShouldShowInShelf() || download->GetState() == download::DownloadItem::IN_PROGRESS) { -@@ -405,44 +395,6 @@ void DownloadsDOMHandler::FinalizeRemova +@@ -404,44 +394,6 @@ void DownloadsDOMHandler::FinalizeRemova } } @@ -1005,17 +996,17 @@ bool DownloadsDOMHandler::IsDeletingHistoryAllowed() { content::DownloadManager* manager = GetMainNotifierManager(); return manager && ---- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h -+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h +--- chrome/browser/ui/webui/downloads/downloads_dom_handler.h.orig ++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.h @@ -12,7 +12,6 @@ - #include "base/memory/raw_ptr.h" + #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/download/download_danger_prompt.h" #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h" #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h" #include "content/public/browser/web_contents_observer.h" -@@ -95,18 +94,6 @@ class DownloadsDOMHandler : public conte +@@ -94,18 +93,6 @@ class DownloadsDOMHandler : public conte // null-checking |original_notifier_|. content::DownloadManager* GetOriginalNotifierManager() const; @@ -1034,9 +1025,9 @@ // Returns true if the records of any downloaded items are allowed (and able) // to be deleted. bool IsDeletingHistoryAllowed(); ---- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc -@@ -274,120 +274,6 @@ CreateHttpsOnlyModePage(content::WebCont +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc.orig ++++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc +@@ -281,116 +281,6 @@ CreateHttpsOnlyModePage(content::WebCont request_url)); } @@ -1046,8 +1037,7 @@ - safe_browsing::SB_THREAT_TYPE_URL_MALWARE; - GURL request_url("http://example.com"); - std::string url_param; -- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url", -- &url_param)) { +- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) { - if (GURL(url_param).is_valid()) { - request_url = GURL(url_param); - } @@ -1056,8 +1046,7 @@ - // TODO(mattm): add flag to change main_frame_url or add dedicated flag to - // test subresource interstitials. - std::string type_param; -- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type", -- &type_param)) { +- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) { - if (type_param == "malware") { - threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; - } else if (type_param == "phishing") { @@ -1105,16 +1094,14 @@ - safe_browsing::SB_THREAT_TYPE_URL_MALWARE; - GURL request_url("http://example.com"); - std::string url_param; -- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "url", -- &url_param)) { +- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) { - if (GURL(url_param).is_valid()) - request_url = GURL(url_param); - } - GURL main_frame_url(request_url); - std::string type_param; - bool is_giant_webview = false; -- if (net::GetValueForKeyInQuery(web_contents->GetVisibleURL(), "type", -- &type_param)) { +- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) { - if (type_param == "malware") { - threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; - } else if (type_param == "phishing") { @@ -1157,16 +1144,16 @@ #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) std::unique_ptr CreateCaptivePortalBlockingPage( content::WebContents* web_contents) { -@@ -502,8 +388,6 @@ void InterstitialHTMLSource::StartDataRe - interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents); - } else if (path_without_query == "/blocked-interception") { +@@ -507,8 +397,6 @@ void InterstitialHTMLSource::StartDataRe interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); + } else if (path_without_query == "/legacy-tls") { + interstitial_delegate = CreateLegacyTLSBlockingPage(web_contents); - } else if (path_without_query == "/safebrowsing") { - interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents); } else if (path_without_query == "/clock") { interstitial_delegate = CreateBadClockBlockingPage(web_contents); } else if (path_without_query == "/lookalike") { -@@ -520,16 +404,12 @@ void InterstitialHTMLSource::StartDataRe +@@ -525,16 +413,12 @@ void InterstitialHTMLSource::StartDataRe interstitial_delegate = CreateHttpsOnlyModePage(web_contents); } @@ -1186,18 +1173,18 @@ html = interstitial_delegate.get()->GetHTMLContents(); } else { html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( ---- a/chrome/renderer/chrome_content_renderer_client.cc -+++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -95,7 +95,6 @@ +--- chrome/renderer/chrome_content_renderer_client.cc.orig ++++ chrome/renderer/chrome_content_renderer_client.cc +@@ -97,7 +97,6 @@ + #include "components/page_load_metrics/renderer/metrics_render_frame_observer.h" #include "components/paint_preview/buildflags/buildflags.h" - #include "components/password_manager/core/common/password_manager_features.h" #include "components/safe_browsing/buildflags.h" -#include "components/safe_browsing/content/renderer/threat_dom_details.h" #include "components/spellcheck/spellcheck_buildflags.h" #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" ---- a/components/security_interstitials/content/cert_report_helper.cc -+++ b/components/security_interstitials/content/cert_report_helper.cc +--- components/security_interstitials/content/cert_report_helper.cc.orig ++++ components/security_interstitials/content/cert_report_helper.cc @@ -177,7 +177,6 @@ void CertReportHelper::FinishCertCollect return; } diff --git a/www/chromium-uc/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/www/chromium-uc/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch index a692d80..b3f1614 100644 --- a/www/chromium-uc/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch +++ b/www/chromium-uc/patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -1,6 +1,6 @@ ---- a/components/autofill/core/browser/autofill_download_manager.cc -+++ b/components/autofill/core/browser/autofill_download_manager.cc -@@ -802,94 +802,6 @@ std::tuple AutofillDo +--- components/autofill/core/browser/autofill_download_manager.cc.orig ++++ components/autofill/core/browser/autofill_download_manager.cc +@@ -824,96 +824,6 @@ std::tuple AutofillDo } bool AutofillDownloadManager::StartRequest(FormRequestData request_data) { @@ -9,7 +9,9 @@ - DCHECK(url_loader_factory); - - // Get the URL and method to use for this request. -- auto [request_url, method] = GetRequestURLAndMethod(request_data); +- std::string method; +- GURL request_url; +- std::tie(request_url, method) = GetRequestURLAndMethod(request_data); - - // Track the URL length for GET queries because the URL length can be in the - // thousands when rich metadata is enabled. @@ -27,7 +29,7 @@ - // On iOS we have a single, shared URLLoaderFactory provided by BrowserState. - // As it is shared, it is not trusted and we cannot assign trusted_params - // to the network request. --#if !BUILDFLAG(IS_IOS) +-#if !defined(OS_IOS) - // Do not call IsolationInfo() for REQUEST_UPLOADs because Password Manager - // uploads when RenderFrameHostImpl::DidCommitNavigation() is called, in which - // case IsolationInfo() may crash because there is no committing diff --git a/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch b/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch index 5b9cd42..894d468 100644 --- a/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch +++ b/www/chromium-uc/patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -1,16 +1,16 @@ ---- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc -+++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc -@@ -27,7 +27,6 @@ namespace extensions { +--- chrome/browser/extensions/component_extensions_allowlist/allowlist.cc.orig ++++ chrome/browser/extensions/component_extensions_allowlist/allowlist.cc +@@ -28,7 +28,6 @@ namespace extensions { bool IsComponentExtensionAllowlisted(const std::string& extension_id) { const char* const kAllowed[] = { - extension_misc::kInAppPaymentsSupportAppId, extension_misc::kPdfExtensionId, - #if BUILDFLAG(IS_CHROMEOS) + #if defined(OS_CHROMEOS) extension_misc::kAssessmentAssistantExtensionId, ---- a/chrome/browser/extensions/component_loader.cc -+++ b/chrome/browser/extensions/component_loader.cc -@@ -356,11 +356,6 @@ void ComponentLoader::AddWebStoreApp() { +--- chrome/browser/extensions/component_loader.cc.orig ++++ chrome/browser/extensions/component_loader.cc +@@ -354,11 +354,6 @@ void ComponentLoader::AddWebStoreApp() { if (!IsNormalSession()) return; #endif @@ -22,7 +22,7 @@ } #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -503,18 +498,6 @@ void ComponentLoader::AddDefaultComponen +@@ -495,18 +490,6 @@ void ComponentLoader::AddDefaultComponen AddHangoutServicesExtension(); #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) @@ -41,8 +41,8 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) if (command_line->HasSwitch(switches::kLoadGuestModeTestExtension)) { base::FilePath path = base::FilePath(command_line->GetSwitchValueASCII( ---- a/chrome/browser/extensions/external_component_loader.cc -+++ b/chrome/browser/extensions/external_component_loader.cc +--- chrome/browser/extensions/external_component_loader.cc.orig ++++ chrome/browser/extensions/external_component_loader.cc @@ -30,9 +30,6 @@ ExternalComponentLoader::~ExternalCompon void ExternalComponentLoader::StartLoading() { @@ -51,11 +51,11 @@ - AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get()); -#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) - #if BUILDFLAG(IS_CHROMEOS) + #if defined(OS_CHROMEOS) { ---- a/chrome/browser/extensions/webstore_installer.cc -+++ b/chrome/browser/extensions/webstore_installer.cc -@@ -553,20 +553,6 @@ void WebstoreInstaller::DownloadNextPend +--- chrome/browser/extensions/webstore_installer.cc.orig ++++ chrome/browser/extensions/webstore_installer.cc +@@ -555,20 +555,6 @@ void WebstoreInstaller::DownloadNextPend void WebstoreInstaller::DownloadCrx( const std::string& extension_id, InstallSource source) { @@ -76,7 +76,7 @@ } // http://crbug.com/165634 -@@ -709,21 +695,6 @@ void WebstoreInstaller::UpdateDownloadPr +@@ -712,21 +698,6 @@ void WebstoreInstaller::UpdateDownloadPr void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(!crx_installer_.get()); diff --git a/www/chromium-uc/patches/core/inox-patchset/0007-disable-web-resource-service.patch b/www/chromium-uc/patches/core/inox-patchset/0007-disable-web-resource-service.patch index a52d1f8..ad9e012 100644 --- a/www/chromium-uc/patches/core/inox-patchset/0007-disable-web-resource-service.patch +++ b/www/chromium-uc/patches/core/inox-patchset/0007-disable-web-resource-service.patch @@ -1,5 +1,5 @@ ---- a/components/web_resource/web_resource_service.cc -+++ b/components/web_resource/web_resource_service.cc +--- components/web_resource/web_resource_service.cc.orig ++++ components/web_resource/web_resource_service.cc @@ -120,44 +120,7 @@ bool WebResourceService::GetFetchSchedul // Initializes the fetching of data from the resource server. Data // load calls OnSimpleLoaderComplete. diff --git a/www/chromium-uc/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch b/www/chromium-uc/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch index ff1eb51..9f78ade 100644 --- a/www/chromium-uc/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch +++ b/www/chromium-uc/patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch @@ -1,6 +1,6 @@ ---- a/net/dns/host_resolver_manager.cc -+++ b/net/dns/host_resolver_manager.cc -@@ -153,10 +153,10 @@ const unsigned kMinimumTTLSeconds = kCac +--- net/dns/host_resolver_manager.cc.orig ++++ net/dns/host_resolver_manager.cc +@@ -139,10 +139,10 @@ const unsigned kMinimumTTLSeconds = kCac // cached. const int kIPv6ProbePeriodMs = 1000; diff --git a/www/chromium-uc/patches/core/inox-patchset/0015-disable-update-pings.patch b/www/chromium-uc/patches/core/inox-patchset/0015-disable-update-pings.patch index 6dced3c..cc7f344 100644 --- a/www/chromium-uc/patches/core/inox-patchset/0015-disable-update-pings.patch +++ b/www/chromium-uc/patches/core/inox-patchset/0015-disable-update-pings.patch @@ -1,6 +1,6 @@ ---- a/chrome/updater/configurator.cc -+++ b/chrome/updater/configurator.cc -@@ -91,7 +91,7 @@ int Configurator::UpdateDelay() const { +--- chrome/updater/configurator.cc.orig ++++ chrome/updater/configurator.cc +@@ -82,7 +82,7 @@ int Configurator::UpdateDelay() const { } std::vector Configurator::UpdateUrl() const { diff --git a/www/chromium-uc/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch b/www/chromium-uc/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch new file mode 100644 index 0000000..269fb0c --- /dev/null +++ b/www/chromium-uc/patches/core/inox-patchset/0017-disable-new-avatar-menu.patch @@ -0,0 +1,11 @@ +--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc.orig ++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc +@@ -86,7 +86,7 @@ void PrimaryAccountPolicyManagerImpl::On + } + + bool PrimaryAccountPolicyManagerImpl::IsSigninAllowed() const { +- return signin_allowed_.GetValue(); ++ return false; + } + + void PrimaryAccountPolicyManagerImpl::OnSigninAllowedPrefChanged( diff --git a/www/chromium-uc/patches/core/inox-patchset/0021-disable-rlz.patch b/www/chromium-uc/patches/core/inox-patchset/0021-disable-rlz.patch index 9620fb2..4b96b3e 100644 --- a/www/chromium-uc/patches/core/inox-patchset/0021-disable-rlz.patch +++ b/www/chromium-uc/patches/core/inox-patchset/0021-disable-rlz.patch @@ -1,8 +1,8 @@ # Disable rlz ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -482,14 +482,6 @@ group("gn_all") { +--- BUILD.gn.orig ++++ BUILD.gn +@@ -485,14 +485,6 @@ group("gn_all") { deps += [ "//chromeos:chromeos_unittests" ] } @@ -17,8 +17,8 @@ if (is_linux || is_chromeos) { # The following are definitely linux-only. deps += [ ---- a/rlz/buildflags/buildflags.gni -+++ b/rlz/buildflags/buildflags.gni +--- rlz/buildflags/buildflags.gni.orig ++++ rlz/buildflags/buildflags.gni @@ -7,6 +7,6 @@ import("//build/config/chromeos/ui_mode. # Whether we are using the rlz library or not. Platforms like Android send diff --git a/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 3b93e8f..198b00e 100644 --- a/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/www/chromium-uc/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -66,19 +66,8 @@ by default. ui/views/examples/webview_example.cc | 2 +- 54 files changed, 89 insertions(+), 87 deletions(-) ---- a/ash/components/geolocation/simple_geolocation_provider.cc -+++ b/ash/components/geolocation/simple_geolocation_provider.cc -@@ -20,7 +20,7 @@ namespace ash { - namespace { - - const char kDefaultGeolocationProviderUrl[] = -- "https://www.googleapis.com/geolocation/v1/geolocate?"; -+ "trk:215:https://www.googleapis.com/geolocation/v1/geolocate?"; - - } // namespace - ---- a/build/apple/tweak_info_plist.py -+++ b/build/apple/tweak_info_plist.py +--- build/apple/tweak_info_plist.py.orig ++++ build/apple/tweak_info_plist.py @@ -195,7 +195,7 @@ def _AddKeystoneKeys(plist, bundle_ident also requires the |bundle_identifier| argument (com.example.product).""" plist['KSVersion'] = plist['CFBundleShortVersionString'] @@ -88,9 +77,9 @@ by default. _RemoveKeys(plist, 'KSChannelID') if base_tag != '': ---- a/chrome/browser/ash/customization/customization_document.cc -+++ b/chrome/browser/ash/customization/customization_document.cc -@@ -198,7 +198,7 @@ std::string ReadFileInBackground(const b +--- chrome/browser/ash/customization/customization_document.cc.orig ++++ chrome/browser/ash/customization/customization_document.cc +@@ -175,7 +175,7 @@ std::string ReadFileInBackground(const b // Template URL where to fetch OEM services customization manifest from. const char ServicesCustomizationDocument::kManifestUrl[] = @@ -99,9 +88,9 @@ by default. // A custom extensions::ExternalLoader that the ServicesCustomizationDocument // creates and uses to publish OEM default apps to the extensions system. ---- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc -@@ -93,7 +93,7 @@ namespace { +--- chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc.orig ++++ chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +@@ -87,7 +87,7 @@ namespace { using api::file_manager_private::ProfileInfo; @@ -110,8 +99,8 @@ by default. // Thresholds for mountCrostini() API. constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = ---- a/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc -+++ b/chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +--- chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc.orig ++++ chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc @@ -52,8 +52,8 @@ namespace { const char kGoogleDotCom[] = "google.com"; @@ -123,9 +112,9 @@ by default. // ContainsAppIdByHash returns true iff the SHA-256 hash of one of the // elements of |list| equals |hash|. ---- a/chrome/browser/extensions/install_signer.cc -+++ b/chrome/browser/extensions/install_signer.cc -@@ -66,7 +66,7 @@ const int kSignatureFormatVersion = 2; +--- chrome/browser/extensions/install_signer.cc.orig ++++ chrome/browser/extensions/install_signer.cc +@@ -67,7 +67,7 @@ const int kSignatureFormatVersion = 2; const size_t kSaltBytes = 32; const char kBackendUrl[] = @@ -134,8 +123,8 @@ by default. const char kPublicKeyPEM[] = \ "-----BEGIN PUBLIC KEY-----" \ ---- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig ++++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -125,7 +125,7 @@ void OnURLLoadUploadProgress(uint64_t cu } // namespace @@ -145,9 +134,9 @@ by default. WebRtcEventLogUploaderImpl::Factory::Factory( scoped_refptr task_runner) ---- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc -+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -484,7 +484,7 @@ void WebRtcLogUploader::UploadCompressed +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig ++++ chrome/browser/media/webrtc/webrtc_log_uploader.cc +@@ -485,7 +485,7 @@ void WebRtcLogUploader::UploadCompressed "Not implemented, it would be good to do so." })"); @@ -156,8 +145,8 @@ by default. auto resource_request = std::make_unique(); resource_request->url = !upload_url_for_testing_.is_empty() ? upload_url_for_testing_ ---- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc -+++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc +--- chrome/browser/nacl_host/nacl_infobar_delegate.cc.orig ++++ chrome/browser/nacl_host/nacl_infobar_delegate.cc @@ -33,7 +33,7 @@ std::u16string NaClInfoBarDelegate::GetL } @@ -167,8 +156,8 @@ by default. } std::u16string NaClInfoBarDelegate::GetMessageText() const { ---- a/chrome/browser/profiles/profile_avatar_downloader.cc -+++ b/chrome/browser/profiles/profile_avatar_downloader.cc +--- chrome/browser/profiles/profile_avatar_downloader.cc.orig ++++ chrome/browser/profiles/profile_avatar_downloader.cc @@ -20,7 +20,7 @@ namespace { @@ -178,8 +167,8 @@ by default. } ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index, ---- a/chrome/browser/resources/default_apps/external_extensions.json -+++ b/chrome/browser/resources/default_apps/external_extensions.json +--- chrome/browser/resources/default_apps/external_extensions.json.orig ++++ chrome/browser/resources/default_apps/external_extensions.json @@ -23,17 +23,17 @@ }, // Google Sheets @@ -201,9 +190,9 @@ by default. } } ---- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc -+++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc -@@ -192,7 +192,7 @@ const int64_t DownloadFeedback::kMaxUplo +--- chrome/browser/safe_browsing/download_protection/download_feedback.cc.orig ++++ chrome/browser/safe_browsing/download_protection/download_feedback.cc +@@ -202,7 +202,7 @@ const int64_t DownloadFeedback::kMaxUplo // static const char DownloadFeedback::kSbFeedbackURL[] = @@ -212,8 +201,8 @@ by default. // static DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr; ---- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +--- chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.orig ++++ chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc @@ -279,7 +279,7 @@ GURL SpellcheckHunspellDictionary::GetDi DCHECK(!bdict_file.empty()); @@ -223,20 +212,20 @@ by default. return GURL(std::string(kDownloadServerUrl) + base::ToLowerASCII(bdict_file)); ---- a/chrome/browser/supervised_user/supervised_user_service.cc -+++ b/chrome/browser/supervised_user/supervised_user_service.cc -@@ -85,7 +85,7 @@ namespace { +--- chrome/browser/supervised_user/supervised_user_service.cc.orig ++++ chrome/browser/supervised_user/supervised_user_service.cc +@@ -87,7 +87,7 @@ namespace { // The URL from which to download a host denylist if no local one exists yet. const char kDenylistURL[] = - "https://www.gstatic.com/chrome/supervised_user/denylist-20141001-1k.bin"; + "trk:272:https://www.gstatic.com/chrome/supervised_user/denylist-20141001-1k.bin"; - // The filename under which we'll store the denylist (in the user data dir). - const char kDenylistFilename[] = "su-denylist.bin"; - ---- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -+++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc -@@ -49,7 +49,7 @@ const char* kUpdateBrowserRedirectUrl = + // The filename under which we'll store the denylist (in the user data dir). The + // old file will be used as a backup in case the new file has not been loaded + // yet. +--- chrome/browser/ui/views/outdated_upgrade_bubble_view.cc.orig ++++ chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +@@ -54,7 +54,7 @@ const char* kUpdateBrowserRedirectUrl = #else // The URL to be used to re-install Chrome when auto-update failed for // too long. @@ -245,9 +234,9 @@ by default. #endif bool g_upgrade_bubble_is_showing = false; ---- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc -@@ -71,17 +71,17 @@ namespace { +--- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc.orig ++++ chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +@@ -67,17 +67,17 @@ namespace { // The URL for the the Learn More page shown on incognito new tab. const char kLearnMoreIncognitoUrl[] = #if BUILDFLAG(IS_CHROMEOS_ASH) @@ -269,8 +258,8 @@ by default. #endif std::string ReplaceTemplateExpressions( ---- a/chrome/chrome_cleaner/components/recovery_component.cc -+++ b/chrome/chrome_cleaner/components/recovery_component.cc +--- chrome/chrome_cleaner/components/recovery_component.cc.orig ++++ chrome/chrome_cleaner/components/recovery_component.cc @@ -37,7 +37,7 @@ namespace chrome_cleaner { namespace { @@ -280,8 +269,8 @@ by default. "&installsource=swreporter&x=id%3Dnpdjjkjlcidkjlamlmmdelcjbcpdjocm" "%26v%3D0.0.0.0%26uc&acceptformat=crx3"; ---- a/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc -+++ b/chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc +--- chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc.orig ++++ chrome/chrome_cleaner/crash/crashpad_crash_reporter.cc @@ -28,7 +28,7 @@ namespace { @@ -291,8 +280,8 @@ by default. // Whether the current process is connected to a crash handler process. bool g_is_connected_to_crash_handler = false; ---- a/chrome/common/extensions/chrome_extensions_client.cc -+++ b/chrome/common/extensions/chrome_extensions_client.cc +--- chrome/common/extensions/chrome_extensions_client.cc.orig ++++ chrome/common/extensions/chrome_extensions_client.cc @@ -45,9 +45,9 @@ namespace { // TODO(battre): Delete the HTTP URL once the blocklist is downloaded via HTTPS. @@ -303,10 +292,10 @@ by default. - "https://www.gstatic.com/chrome/extensions/blocklist"; + "trk:270:https://www.gstatic.com/chrome/extensions/blocklist"; - } // namespace + const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh"; ---- a/chrome/installer/setup/google_chrome_behaviors.cc -+++ b/chrome/installer/setup/google_chrome_behaviors.cc +--- chrome/installer/setup/google_chrome_behaviors.cc.orig ++++ chrome/installer/setup/google_chrome_behaviors.cc @@ -37,7 +37,7 @@ namespace installer { namespace { @@ -316,8 +305,19 @@ by default. bool NavigateToUrlWithEdge(const std::wstring& url) { std::wstring protocol_url = L"microsoft-edge:" + url; ---- a/chromecast/crash/linux/minidump_uploader.cc -+++ b/chromecast/crash/linux/minidump_uploader.cc +--- chromecast/browser/service/cast_service_simple.cc.orig ++++ chromecast/browser/service/cast_service_simple.cc +@@ -27,7 +27,7 @@ GURL GetStartupURL() { + const base::CommandLine::StringVector& args = command_line->GetArgs(); + + if (args.empty()) +- return GURL("http://www.google.com/"); ++ return GURL("trk:255:http://www.google.com/"); + + GURL url(args[0]); + if (url.is_valid() && url.has_scheme()) +--- chromecast/crash/linux/minidump_uploader.cc.orig ++++ chromecast/crash/linux/minidump_uploader.cc @@ -41,7 +41,7 @@ namespace { const char kProductName[] = "Eureka"; @@ -327,9 +327,39 @@ by default. const char kVirtualChannel[] = "virtual-channel"; ---- a/components/drive/service/drive_api_service.cc -+++ b/components/drive/service/drive_api_service.cc -@@ -76,9 +76,9 @@ namespace drive { +--- chromeos/geolocation/simple_geolocation_provider.cc.orig ++++ chromeos/geolocation/simple_geolocation_provider.cc +@@ -20,7 +20,7 @@ namespace chromeos { + namespace { + + const char kDefaultGeolocationProviderUrl[] = +- "https://www.googleapis.com/geolocation/v1/geolocate?"; ++ "trk:215:https://www.googleapis.com/geolocation/v1/geolocate?"; + + } // namespace + +--- components/cloud_devices/common/cloud_devices_urls.cc.orig ++++ components/cloud_devices/common/cloud_devices_urls.cc +@@ -13,14 +13,14 @@ + namespace cloud_devices { + + const char kCloudPrintAuthScope[] = +- "https://www.googleapis.com/auth/cloudprint"; ++ "trk:197:https://www.googleapis.com/auth/cloudprint"; + + namespace { + + // Url must not be matched by "urls" section of + // cloud_print_app/manifest.json. If it's matched, print driver dialog will + // open sign-in page in separate window. +-const char kCloudPrintURL[] = "https://www.google.com/cloudprint"; ++const char kCloudPrintURL[] = "trk:201:https://www.google.com/cloudprint"; + + } + +--- components/drive/service/drive_api_service.cc.orig ++++ components/drive/service/drive_api_service.cc +@@ -75,9 +75,9 @@ namespace drive { namespace { // OAuth2 scopes for Drive API. @@ -341,9 +371,9 @@ by default. const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps"; // Mime type to create a directory. ---- a/components/feedback/feedback_uploader.cc -+++ b/components/feedback/feedback_uploader.cc -@@ -38,7 +38,7 @@ constexpr base::FilePath::CharType kFeed +--- components/feedback/feedback_uploader.cc.orig ++++ components/feedback/feedback_uploader.cc +@@ -27,7 +27,7 @@ constexpr base::FilePath::CharType kFeed FILE_PATH_LITERAL("Feedback Reports"); constexpr char kFeedbackPostUrl[] = @@ -352,9 +382,9 @@ by default. constexpr char kProtoBufMimeType[] = "application/x-protobuf"; ---- a/components/google/core/common/google_util.cc -+++ b/components/google/core/common/google_util.cc -@@ -141,7 +141,7 @@ bool IsGoogleSearchSubdomainUrl(const GU +--- components/google/core/common/google_util.cc.orig ++++ components/google/core/common/google_util.cc +@@ -143,7 +143,7 @@ bool IsGoogleSearchSubdomainUrl(const GU // Global functions ----------------------------------------------------------- @@ -363,9 +393,9 @@ by default. bool HasGoogleSearchQueryParam(base::StringPiece str) { url::Component query(0, static_cast(str.length())), key, value; ---- a/components/history/core/browser/web_history_service.cc -+++ b/components/history/core/browser/web_history_service.cc -@@ -45,13 +45,13 @@ namespace history { +--- components/history/core/browser/web_history_service.cc.orig ++++ components/history/core/browser/web_history_service.cc +@@ -42,13 +42,13 @@ namespace history { namespace { const char kHistoryOAuthScope[] = @@ -382,8 +412,8 @@ by default. const char kHistoryAudioHistoryUrl[] = "https://history.google.com/history/api/lookup?client=audio"; ---- a/components/metrics/url_constants.cc -+++ b/components/metrics/url_constants.cc +--- components/metrics/url_constants.cc.orig ++++ components/metrics/url_constants.cc @@ -7,7 +7,7 @@ namespace metrics { @@ -393,9 +423,9 @@ by default. const char kNewMetricsServerUrlInsecure[] = "http://clientservices.googleapis.com/uma/v2"; ---- a/components/safe_browsing/content/browser/client_side_detection_service.cc -+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -61,7 +61,7 @@ const int ClientSideDetectionService::kN +--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig ++++ components/safe_browsing/content/browser/client_side_detection_service.cc +@@ -62,7 +62,7 @@ const int ClientSideDetectionService::kN const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30; const char ClientSideDetectionService::kClientReportPhishingUrl[] = @@ -404,8 +434,8 @@ by default. struct ClientSideDetectionService::ClientPhishingReportInfo { std::unique_ptr loader; ---- a/components/safe_search_api/safe_search/safe_search_url_checker_client.cc -+++ b/components/safe_search_api/safe_search/safe_search_url_checker_client.cc +--- components/safe_search_api/safe_search/safe_search_url_checker_client.cc.orig ++++ components/safe_search_api/safe_search/safe_search_url_checker_client.cc @@ -28,7 +28,7 @@ namespace safe_search_api { namespace { @@ -415,8 +445,8 @@ by default. const char kDataContentType[] = "application/x-www-form-urlencoded"; const char kDataFormat[] = "key=%s&urls=%s"; ---- a/components/safe_search_api/stub_url_checker.cc -+++ b/components/safe_search_api/stub_url_checker.cc +--- components/safe_search_api/stub_url_checker.cc.orig ++++ components/safe_search_api/stub_url_checker.cc @@ -21,7 +21,7 @@ namespace safe_search_api { namespace { @@ -425,9 +455,9 @@ by default. + "trk:238:https://safesearch.googleapis.com/v1:classify"; std::string BuildResponse(bool is_porn) { - base::Value dict(base::Value::Type::DICTIONARY); ---- a/components/translate/core/browser/translate_url_fetcher.cc -+++ b/components/translate/core/browser/translate_url_fetcher.cc + base::DictionaryValue dict; +--- components/translate/core/browser/translate_url_fetcher.cc.orig ++++ components/translate/core/browser/translate_url_fetcher.cc @@ -99,6 +99,7 @@ bool TranslateURLFetcher::Request(const if (!extra_request_header_.empty()) resource_request->headers.AddHeaderFromString(extra_request_header_); @@ -436,9 +466,9 @@ by default. simple_loader_ = variations::CreateSimpleURLLoaderWithVariationsHeaderUnknownSignedIn( std::move(resource_request), ---- a/components/translate/core/common/translate_util.cc -+++ b/components/translate/core/common/translate_util.cc -@@ -21,7 +21,7 @@ const char kDetectLanguageInSubFrames[] +--- components/translate/core/common/translate_util.cc.orig ++++ components/translate/core/common/translate_util.cc +@@ -20,7 +20,7 @@ const char kDetectLanguageInSubFrames[] } // namespace @@ -447,8 +477,8 @@ by default. const base::Feature kTranslateSubFrames{"TranslateSubFrames", base::FEATURE_DISABLED_BY_DEFAULT}; ---- a/components/variations/variations_url_constants.cc -+++ b/components/variations/variations_url_constants.cc +--- components/variations/variations_url_constants.cc.orig ++++ components/variations/variations_url_constants.cc @@ -8,7 +8,7 @@ namespace variations { // Default server of Variations seed info. @@ -458,8 +488,8 @@ by default. const char kDefaultInsecureServerUrl[] = "http://clientservices.googleapis.com/chrome-variations/seed"; ---- a/content/browser/speech/speech_recognition_engine.cc -+++ b/content/browser/speech/speech_recognition_engine.cc +--- content/browser/speech/speech_recognition_engine.cc.orig ++++ content/browser/speech/speech_recognition_engine.cc @@ -33,7 +33,7 @@ namespace content { namespace { @@ -469,9 +499,9 @@ by default. const char kDownstreamUrl[] = "/down?"; const char kUpstreamUrl[] = "/up?"; ---- a/content/browser/webauth/authenticator_common.cc -+++ b/content/browser/webauth/authenticator_common.cc -@@ -92,9 +92,9 @@ enum class RequestExtension { +--- content/browser/webauth/authenticator_common.cc.orig ++++ content/browser/webauth/authenticator_common.cc +@@ -88,9 +88,9 @@ enum class RequestExtension { namespace { constexpr char kGstaticAppId[] = @@ -483,19 +513,19 @@ by default. WebAuthenticationDelegate* GetWebAuthenticationDelegate() { return GetContentClient()->browser()->GetWebAuthenticationDelegate(); ---- a/content/shell/browser/shell_browser_main_parts.cc -+++ b/content/shell/browser/shell_browser_main_parts.cc -@@ -86,7 +86,7 @@ GURL GetStartupURL() { +--- content/shell/browser/shell_browser_main_parts.cc.orig ++++ content/shell/browser/shell_browser_main_parts.cc +@@ -96,7 +96,7 @@ GURL GetStartupURL() { #else const base::CommandLine::StringVector& args = command_line->GetArgs(); if (args.empty()) - return GURL("https://www.google.com/"); + return GURL("trk:183:https://www.google.com/"); - #if BUILDFLAG(IS_WIN) + #if defined(OS_WIN) GURL url(base::WideToUTF16(args[0])); ---- a/extensions/common/extension_urls.cc -+++ b/extensions/common/extension_urls.cc +--- extensions/common/extension_urls.cc.orig ++++ extensions/common/extension_urls.cc @@ -26,9 +26,9 @@ bool IsSourceFromAnExtension(const std:: namespace extension_urls { @@ -508,9 +538,9 @@ by default. GURL GetWebstoreLaunchURL() { extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get(); ---- a/google_apis/gaia/gaia_constants.cc -+++ b/google_apis/gaia/gaia_constants.cc -@@ -25,149 +25,149 @@ const char kSyncService[] = "chromiumsyn +--- google_apis/gaia/gaia_constants.cc.orig ++++ google_apis/gaia/gaia_constants.cc +@@ -25,133 +25,133 @@ const char kSyncService[] = "chromiumsyn const char kRemotingService[] = "chromoting"; // OAuth scopes. @@ -535,6 +565,11 @@ by default. - "https://www.googleapis.com/auth/chromesync_playpen"; + "trk:073:https://www.googleapis.com/auth/chromesync_playpen"; + // OAuth2 scope for access to Kid Management API. + const char kKidManagementOAuth2Scope[] = +- "https://www.googleapis.com/auth/kid.management"; ++ "trk:074:https://www.googleapis.com/auth/kid.management"; + // OAuth2 scope for parental consent logging for secondary account addition. const char kKidManagementPrivilegedOAuth2Scope[] = - "https://www.googleapis.com/auth/kid.management.privileged"; @@ -558,150 +593,125 @@ by default. - "https://www.googleapis.com/auth/userinfo.profile"; + "trk:079:https://www.googleapis.com/auth/userinfo.profile"; - // OAuth2 scope for access to the parent approval widget. - const char kParentApprovalOAuth2Scope[] = -- "https://www.googleapis.com/auth/kids.parentapproval"; -+ "trk:080:https://www.googleapis.com/auth/kids.parentapproval"; - // OAuth2 scope for access to the people API (read-only). const char kPeopleApiReadOnlyOAuth2Scope[] = - "https://www.googleapis.com/auth/peopleapi.readonly"; -+ "trk:081:https://www.googleapis.com/auth/peopleapi.readonly"; - - // OAuth2 scope for access to the programmatic challenge API (read-only). - const char kProgrammaticChallengeOAuth2Scope[] = -- "https://www.googleapis.com/auth/accounts.programmaticchallenge"; -+ "trk:082:https://www.googleapis.com/auth/accounts.programmaticchallenge"; ++ "trk:080:https://www.googleapis.com/auth/peopleapi.readonly"; // OAuth2 scope for access to the Reauth flow. const char kAccountsReauthOAuth2Scope[] = - "https://www.googleapis.com/auth/accounts.reauth"; -+ "trk:083:https://www.googleapis.com/auth/accounts.reauth"; ++ "trk:081:https://www.googleapis.com/auth/accounts.reauth"; // OAuth2 scope for access to audit recording (ARI). const char kAuditRecordingOAuth2Scope[] = - "https://www.googleapis.com/auth/auditrecording-pa"; -+ "trk:084:https://www.googleapis.com/auth/auditrecording-pa"; ++ "trk:082:https://www.googleapis.com/auth/auditrecording-pa"; // OAuth2 scope for access to clear cut logs. -const char kClearCutOAuth2Scope[] = "https://www.googleapis.com/auth/cclog"; -+const char kClearCutOAuth2Scope[] = "trk:085:https://www.googleapis.com/auth/cclog"; ++const char kClearCutOAuth2Scope[] = "trk:083:https://www.googleapis.com/auth/cclog"; // OAuth2 scope for FCM, the Firebase Cloud Messaging service. const char kFCMOAuthScope[] = - "https://www.googleapis.com/auth/firebase.messaging"; -+ "trk:086:https://www.googleapis.com/auth/firebase.messaging"; ++ "trk:084:https://www.googleapis.com/auth/firebase.messaging"; // OAuth2 scope for access to Tachyon api. -const char kTachyonOAuthScope[] = "https://www.googleapis.com/auth/tachyon"; -+const char kTachyonOAuthScope[] = "trk:087:https://www.googleapis.com/auth/tachyon"; ++const char kTachyonOAuthScope[] = "trk:085:https://www.googleapis.com/auth/tachyon"; // OAuth2 scope for access to the Photos API. -const char kPhotosOAuth2Scope[] = "https://www.googleapis.com/auth/photos"; -+const char kPhotosOAuth2Scope[] = "trk:088:https://www.googleapis.com/auth/photos"; - - // OAuth2 scope for access to the SecureConnect API. - extern const char kSecureConnectOAuth2Scope[] = -- "https://www.googleapis.com/auth/bce.secureconnect"; -+ "trk:074:https://www.googleapis.com/auth/bce.secureconnect"; ++const char kPhotosOAuth2Scope[] = "trk:086:https://www.googleapis.com/auth/photos"; // OAuth2 scope for access to Cast backdrop API. const char kCastBackdropOAuth2Scope[] = - "https://www.googleapis.com/auth/cast.backdrop"; -+ "trk:089:https://www.googleapis.com/auth/cast.backdrop"; ++ "trk:087:https://www.googleapis.com/auth/cast.backdrop"; // OAuth scope for access to Cloud Translation API. const char kCloudTranslationOAuth2Scope[] = - "https://www.googleapis.com/auth/cloud-translation"; -+ "trk:090:https://www.googleapis.com/auth/cloud-translation"; ++ "trk:088:https://www.googleapis.com/auth/cloud-translation"; // OAuth2 scope for access to passwords leak checking API. const char kPasswordsLeakCheckOAuth2Scope[] = - "https://www.googleapis.com/auth/identity.passwords.leak.check"; -+ "trk:091:https://www.googleapis.com/auth/identity.passwords.leak.check"; ++ "trk:089:https://www.googleapis.com/auth/identity.passwords.leak.check"; // OAuth2 scope for access to Chrome safe browsing API. const char kChromeSafeBrowsingOAuth2Scope[] = - "https://www.googleapis.com/auth/chrome-safe-browsing"; -+ "trk:092:https://www.googleapis.com/auth/chrome-safe-browsing"; ++ "trk:090:https://www.googleapis.com/auth/chrome-safe-browsing"; // OAuth2 scope for access to kid permissions by URL. const char kClassifyUrlKidPermissionOAuth2Scope[] = - "https://www.googleapis.com/auth/kid.permission"; -+ "trk:093:https://www.googleapis.com/auth/kid.permission"; ++ "trk:091:https://www.googleapis.com/auth/kid.permission"; const char kKidFamilyReadonlyOAuth2Scope[] = - "https://www.googleapis.com/auth/kid.family.readonly"; -+ "trk:094:https://www.googleapis.com/auth/kid.family.readonly"; ++ "trk:092:https://www.googleapis.com/auth/kid.family.readonly"; // OAuth2 scope for access to payments. const char kPaymentsOAuth2Scope[] = - "https://www.googleapis.com/auth/wallet.chrome"; -+ "trk:095:https://www.googleapis.com/auth/wallet.chrome"; ++ "trk:093:https://www.googleapis.com/auth/wallet.chrome"; const char kCryptAuthOAuth2Scope[] = - "https://www.googleapis.com/auth/cryptauth"; -+ "trk:096:https://www.googleapis.com/auth/cryptauth"; ++ "trk:094:https://www.googleapis.com/auth/cryptauth"; // OAuth2 scope for access to Drive. -const char kDriveOAuth2Scope[] = "https://www.googleapis.com/auth/drive"; -+const char kDriveOAuth2Scope[] = "trk:097:https://www.googleapis.com/auth/drive"; ++const char kDriveOAuth2Scope[] = "trk:095:https://www.googleapis.com/auth/drive"; // The scope required for an access token in order to query ItemSuggest. const char kDriveReadOnlyOAuth2Scope[] = - "https://www.googleapis.com/auth/drive.readonly"; -+ "trk:098:https://www.googleapis.com/auth/drive.readonly"; ++ "trk:096:https://www.googleapis.com/auth/drive.readonly"; // OAuth2 scope for access to Assistant SDK. const char kAssistantOAuth2Scope[] = - "https://www.googleapis.com/auth/assistant-sdk-prototype"; -+ "trk:099:https://www.googleapis.com/auth/assistant-sdk-prototype"; ++ "trk:097:https://www.googleapis.com/auth/assistant-sdk-prototype"; // OAuth2 scope for access to nearby devices (fast pair) APIs. const char kCloudPlatformProjectsOAuth2Scope[] = - "https://www.googleapis.com/auth/cloudplatformprojects"; -+ "trk:100:https://www.googleapis.com/auth/cloudplatformprojects"; ++ "trk:098:https://www.googleapis.com/auth/cloudplatformprojects"; // OAuth2 scope for access to nearby sharing. const char kNearbyShareOAuth2Scope[] = - "https://www.googleapis.com/auth/nearbysharing-pa"; -+ "trk:101:https://www.googleapis.com/auth/nearbysharing-pa"; ++ "trk:099:https://www.googleapis.com/auth/nearbysharing-pa"; // OAuth2 scopes for access to GCM account tracker. -const char kGCMGroupServerOAuth2Scope[] = "https://www.googleapis.com/auth/gcm"; -+const char kGCMGroupServerOAuth2Scope[] = "trk:102:https://www.googleapis.com/auth/gcm"; ++const char kGCMGroupServerOAuth2Scope[] = "trk:100:https://www.googleapis.com/auth/gcm"; const char kGCMCheckinServerOAuth2Scope[] = - "https://www.googleapis.com/auth/android_checkin"; -+ "trk:103:https://www.googleapis.com/auth/android_checkin"; ++ "trk:101:https://www.googleapis.com/auth/android_checkin"; // OAuth2 scope for access to readonly Chrome web store. const char kChromeWebstoreOAuth2Scope[] = - "https://www.googleapis.com/auth/chromewebstore.readonly"; -+ "trk:104:https://www.googleapis.com/auth/chromewebstore.readonly"; ++ "trk:102:https://www.googleapis.com/auth/chromewebstore.readonly"; // OAuth2 scope for access to Account Capabilities API. const char kAccountCapabilitiesOAuth2Scope[] = - "https://www.googleapis.com/auth/account.capabilities"; -+ "trk:105:https://www.googleapis.com/auth/account.capabilities"; ++ "trk:103:https://www.googleapis.com/auth/account.capabilities"; // OAuth2 scope for support content API. const char kSupportContentOAuth2Scope[] = - "https://www.googleapis.com/auth/supportcontent"; -+ "trk:106:https://www.googleapis.com/auth/supportcontent"; ++ "trk:104:https://www.googleapis.com/auth/supportcontent"; // OAuth 2 scope for NTP Photos module API. const char kPhotosModuleOAuth2Scope[] = -- "https://www.googleapis.com/auth/photos.firstparty.readonly"; -+ "trk:107:https://www.googleapis.com/auth/photos.firstparty.readonly"; - - // OAuth 2 scope for NTP Photos module image API. - const char kPhotosModuleImageOAuth2Scope[] = -- "https://www.googleapis.com/auth/photos.image.readonly"; -+ "trk:108:https://www.googleapis.com/auth/photos.image.readonly"; - - // Used to mint uber auth tokens when needed. - const char kGaiaSid[] = "sid"; ---- a/google_apis/gaia/gaia_urls.cc -+++ b/google_apis/gaia/gaia_urls.cc +--- google_apis/gaia/gaia_urls.cc.orig ++++ google_apis/gaia/gaia_urls.cc @@ -24,6 +24,7 @@ namespace { @@ -710,9 +720,9 @@ by default. const char kDefaultGoogleUrl[] = "http://google.com"; const char kDefaultGaiaUrl[] = "https://accounts.google.com"; const char kDefaultGoogleApisBaseUrl[] = "https://www.googleapis.com"; ---- a/google_apis/gcm/engine/gservices_settings.cc -+++ b/google_apis/gcm/engine/gservices_settings.cc -@@ -29,18 +29,18 @@ const char kRegistrationURLKey[] = "gcm_ +--- google_apis/gcm/engine/gservices_settings.cc.orig ++++ google_apis/gcm/engine/gservices_settings.cc +@@ -30,18 +30,18 @@ const char kRegistrationURLKey[] = "gcm_ const int64_t kDefaultCheckinInterval = 2 * 24 * 60 * 60; // seconds = 2 days. const int64_t kMinimumCheckinInterval = 12 * 60 * 60; // seconds = 12 hours. @@ -734,8 +744,19 @@ by default. const int kMaxSecurePort = 65535; std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) { ---- a/remoting/base/breakpad_mac.mm -+++ b/remoting/base/breakpad_mac.mm +--- jingle/notifier/base/gaia_token_pre_xmpp_auth.cc.orig ++++ jingle/notifier/base/gaia_token_pre_xmpp_auth.cc +@@ -36,7 +36,7 @@ class GaiaCookieMechanism : public jingl + // These attributes are necessary for working with non-gmail gaia + // accounts. + const std::string NS_GOOGLE_AUTH_PROTOCOL( +- "http://www.google.com/talk/protocol/auth"); ++ "trk:179:http://www.google.com/talk/protocol/auth"); + const jingle_xmpp::QName QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN( + NS_GOOGLE_AUTH_PROTOCOL, "allow-generated-jid"); + const jingle_xmpp::QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT( +--- remoting/base/breakpad_mac.mm.orig ++++ remoting/base/breakpad_mac.mm @@ -50,7 +50,7 @@ void InitializeCrashReporting() { breakpad_config[@BREAKPAD_REPORT_INTERVAL] = @"21600"; } @@ -745,8 +766,8 @@ by default. } if (!BreakpadCreate(breakpad_config)) { ---- a/remoting/protocol/jingle_messages.cc -+++ b/remoting/protocol/jingle_messages.cc +--- remoting/protocol/jingle_messages.cc.orig ++++ remoting/protocol/jingle_messages.cc @@ -27,7 +27,7 @@ const char kJabberNamespace[] = "jabber: const char kJingleNamespace[] = "urn:xmpp:jingle:1"; @@ -756,8 +777,8 @@ by default. const char kWebrtcTransportNamespace[] = "google:remoting:webrtc"; ---- a/rlz/lib/lib_values.cc -+++ b/rlz/lib/lib_values.cc +--- rlz/lib/lib_values.cc.orig ++++ rlz/lib/lib_values.cc @@ -40,7 +40,7 @@ const char kSetDccResponseVariable[] = " // @@ -767,8 +788,37 @@ by default. const int kFinancialPort = 443; // Ping times in 100-nanosecond intervals. ---- a/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js -+++ b/ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js +--- third_party/libjingle_xmpp/xmpp/constants.cc.orig ++++ third_party/libjingle_xmpp/xmpp/constants.cc +@@ -194,7 +194,7 @@ const StaticQName QN_SASL_TEMPORARY_AUTH + + // These are non-standard. + const char NS_GOOGLE_AUTH_PROTOCOL[] = +- "http://www.google.com/talk/protocol/auth"; ++ "trk:236:http://www.google.com/talk/protocol/auth"; + const StaticQName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT = + { NS_GOOGLE_AUTH_PROTOCOL, "client-uses-full-bind-result" }; + const StaticQName QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN = +@@ -338,7 +338,7 @@ const char STR_SHOW_DND[] = "dnd"; + const char STR_SHOW_XA[] = "xa"; + const char STR_SHOW_OFFLINE[] = "offline"; + +-const char NS_GOOGLE_PSTN_CONFERENCE[] = "http://www.google.com/pstn-conference"; ++const char NS_GOOGLE_PSTN_CONFERENCE[] = "trk:237:http://www.google.com/pstn-conference"; + const StaticQName QN_GOOGLE_PSTN_CONFERENCE_STATUS = { NS_GOOGLE_PSTN_CONFERENCE, "status" }; + const StaticQName QN_ATTR_STATUS = { STR_EMPTY, "status" }; + +@@ -433,7 +433,7 @@ const StaticQName QN_MUC_ROLE = { NS_MUC + const char STR_AFFILIATION_NONE[] = "none"; + const char STR_ROLE_PARTICIPANT[] = "participant"; + +-const char NS_GOOGLE_SESSION[] = "http://www.google.com/session"; ++const char NS_GOOGLE_SESSION[] = "trk:238:http://www.google.com/session"; + const StaticQName QN_GOOGLE_CIRCLE_ID = { STR_EMPTY, "google-circle-id" }; + const StaticQName QN_GOOGLE_USER_ID = { STR_EMPTY, "google-user-id" }; + const StaticQName QN_GOOGLE_SESSION_BLOCKED = { NS_GOOGLE_SESSION, "blocked" }; +--- ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js.orig ++++ ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js @@ -72,9 +72,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = { 'outputContextFirst': false, 'position': '{}', @@ -781,8 +831,8 @@ by default. 'sticky': false, 'typingEcho': 0, 'useIBeamCursor': cvox.ChromeVox.isMac, ---- a/ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js -+++ b/ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js +--- ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js.orig ++++ ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js @@ -96,9 +96,9 @@ cvox.ChromeHost.prototype.init = functio (!cvox.ApiImplementation.siteSpecificScriptLoader || !cvox.ApiImplementation.siteSpecificScriptBase); @@ -795,8 +845,8 @@ by default. if (apiPrefsChanged) { var searchInit = prefs['siteSpecificEnhancements'] === 'true' ? cvox.SearchLoader.init : ---- a/ui/views/examples/webview_example.cc -+++ b/ui/views/examples/webview_example.cc +--- ui/views/examples/webview_example.cc.orig ++++ ui/views/examples/webview_example.cc @@ -29,7 +29,7 @@ void WebViewExample::CreateExampleView(V webview_->GetWebContents()->SetDelegate(this); container->SetLayoutManager(std::make_unique()); diff --git a/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch b/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch index 4a81a5f..021abee 100644 --- a/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch +++ b/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -14,9 +14,9 @@ the URL so we get notified if this happens again in the future). .../security_interstitials/core/safe_browsing_loud_error_ui.cc | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) ---- a/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc -+++ b/chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc -@@ -36,8 +36,7 @@ ChromeSafeBrowsingBlockingPageFactory::C +--- chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc.orig ++++ chrome/browser/safe_browsing/chrome_safe_browsing_blocking_page_factory.cc +@@ -35,8 +35,7 @@ ChromeSafeBrowsingBlockingPageFactory::C Profile::FromBrowserContext(web_contents->GetBrowserContext()); // Create appropriate display options for this blocking page. PrefService* prefs = profile->GetPrefs(); @@ -26,8 +26,8 @@ the URL so we get notified if this happens again in the future). bool is_proceed_anyway_disabled = prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled); ---- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc -+++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc +--- chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc.orig ++++ chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc @@ -27,7 +27,7 @@ namespace safe_browsing { namespace { @@ -37,9 +37,9 @@ the URL so we get notified if this happens again in the future). constexpr net::NetworkTrafficAnnotationTag kSafeBrowsingIncidentTrafficAnnotation = ---- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -306,11 +306,14 @@ IncidentReportingService::UploadContext: +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig ++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +@@ -308,11 +308,14 @@ IncidentReportingService::UploadContext: // static bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { @@ -54,9 +54,9 @@ 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 -@@ -278,7 +278,7 @@ SafeBrowsingUIManager* SafeBrowsingServi +--- chrome/browser/safe_browsing/safe_browsing_service.cc.orig ++++ chrome/browser/safe_browsing/safe_browsing_service.cc +@@ -286,7 +286,7 @@ SafeBrowsingUIManager* SafeBrowsingServi } void SafeBrowsingService::RegisterAllDelayedAnalysis() { @@ -65,8 +65,8 @@ the URL so we get notified if this happens again in the future). RegisterBinaryIntegrityAnalysis(); #endif } ---- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc -+++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc +--- components/security_interstitials/core/safe_browsing_loud_error_ui.cc.orig ++++ components/security_interstitials/core/safe_browsing_loud_error_ui.cc @@ -25,11 +25,11 @@ namespace { // For malware interstitial pages, we link the problematic URL to Google's // diagnostic page. diff --git a/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch index e6ceb63..23f0675 100644 --- a/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch +++ b/www/chromium-uc/patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch @@ -11,9 +11,9 @@ This prevents trk:148 (phishing) and trk:149 (malware). components/safe_browsing/content/browser/client_side_detection_service.cc | 5 +++++ 1 file changed, 5 insertions(+) ---- a/components/safe_browsing/content/browser/client_side_detection_service.cc -+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc -@@ -216,6 +216,10 @@ void ClientSideDetectionService::StartCl +--- components/safe_browsing/content/browser/client_side_detection_service.cc.orig ++++ components/safe_browsing/content/browser/client_side_detection_service.cc +@@ -209,6 +209,10 @@ void ClientSideDetectionService::StartCl return; } @@ -24,7 +24,7 @@ This prevents trk:148 (phishing) and trk:149 (malware). // Fill in metadata about which model we used. *request->mutable_population() = delegate_->GetUserPopulation(); -@@ -295,6 +299,7 @@ void ClientSideDetectionService::StartCl +@@ -288,6 +292,7 @@ void ClientSideDetectionService::StartCl base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent, base::Unretained(WebUIInfoSingleton::GetInstance()), std::move(request), access_token)); diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch b/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch index 1fb55bb..1e29eb6 100644 --- a/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch +++ b/www/chromium-uc/patches/core/ungoogled-chromium/block-requests.patch @@ -1,7 +1,7 @@ ## Prevent request attempts # chrome://discards/ attempts to use d3 to display the graph ---- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc -+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +--- chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc.orig ++++ chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc @@ -286,6 +286,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; @@ -10,9 +10,9 @@ callbacks_.push_back(std::move(callback)); // Note: If there is an ongoing request, abandon it. It's possible that ---- a/chrome/browser/new_tab_page/promos/promo_service.cc -+++ b/chrome/browser/new_tab_page/promos/promo_service.cc -@@ -139,6 +139,7 @@ PromoService::PromoService( +--- chrome/browser/new_tab_page/promos/promo_service.cc.orig ++++ chrome/browser/new_tab_page/promos/promo_service.cc +@@ -138,6 +138,7 @@ PromoService::PromoService( PromoService::~PromoService() = default; void PromoService::Refresh() { @@ -20,8 +20,8 @@ net::NetworkTrafficAnnotationTag traffic_annotation = net::DefineNetworkTrafficAnnotation("promo_service", R"( semantics { ---- a/chrome/browser/resources/discards/graph_doc_template.html -+++ b/chrome/browser/resources/discards/graph_doc_template.html +--- chrome/browser/resources/discards/graph_doc_template.html.orig ++++ chrome/browser/resources/discards/graph_doc_template.html @@ -78,10 +78,6 @@ URL. As result, this document needs to b } @@ -33,9 +33,9 @@ ---- a/chrome/browser/search/background/ntp_background_service.cc -+++ b/chrome/browser/search/background/ntp_background_service.cc -@@ -84,6 +84,7 @@ void NtpBackgroundService::Shutdown() { +--- chrome/browser/search/background/ntp_background_service.cc.orig ++++ chrome/browser/search/background/ntp_background_service.cc +@@ -83,6 +83,7 @@ void NtpBackgroundService::Shutdown() { } void NtpBackgroundService::FetchCollectionInfo() { @@ -43,8 +43,8 @@ if (collections_loader_ != nullptr) return; collection_error_info_.ClearError(); ---- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc -+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +--- chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc.orig ++++ chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc @@ -286,6 +286,7 @@ GURL SpellcheckHunspellDictionary::GetDi } @@ -53,8 +53,8 @@ DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK(browser_context_); ---- a/components/assist_ranker/ranker_url_fetcher.cc -+++ b/components/assist_ranker/ranker_url_fetcher.cc +--- components/assist_ranker/ranker_url_fetcher.cc.orig ++++ components/assist_ranker/ranker_url_fetcher.cc @@ -31,6 +31,7 @@ bool RankerURLFetcher::Request( const GURL& url, RankerURLFetcher::Callback callback, @@ -63,11 +63,11 @@ // This function is not supposed to be called if the previous operation is not // finished. if (state_ == REQUESTING) { ---- a/components/update_client/update_checker.cc -+++ b/components/update_client/update_checker.cc -@@ -108,6 +108,7 @@ void UpdateCheckerImpl::CheckForUpdates( - const IdToComponentPtrMap& components, +--- components/update_client/update_checker.cc.orig ++++ components/update_client/update_checker.cc +@@ -129,6 +129,7 @@ void UpdateCheckerImpl::CheckForUpdates( const base::flat_map& additional_attributes, + bool enabled_component_updates, UpdateCheckCallback update_check_callback) { + return; DCHECK(thread_checker_.CalledOnValidThread()); diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch index f8e7844..8b68a77 100644 --- a/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch +++ b/www/chromium-uc/patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -1,9 +1,9 @@ # Block all connection requests with 'qjz9zk' in the domain name or with a 'trk:' scheme. # This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved' ---- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -+++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -58,6 +58,7 @@ ChromeAutocompleteSchemeClassifier::GetI +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig ++++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc +@@ -56,6 +56,7 @@ ChromeAutocompleteSchemeClassifier::GetI if (base::IsStringASCII(scheme) && (ProfileIOData::IsHandledProtocol(scheme) || base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) || @@ -11,8 +11,8 @@ base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) || base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) { return metrics::OmniboxInputType::URL; ---- a/chrome/browser/history/history_utils.cc -+++ b/chrome/browser/history/history_utils.cc +--- chrome/browser/history/history_utils.cc.orig ++++ chrome/browser/history/history_utils.cc @@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url) url.SchemeIs(content::kChromeDevToolsScheme) || url.SchemeIs(content::kChromeUIScheme) || @@ -21,21 +21,21 @@ url.SchemeIs(chrome::kChromeNativeScheme) || url.SchemeIs(chrome::kChromeSearchScheme) || url.SchemeIs(dom_distiller::kDomDistillerScheme)) ---- a/chrome/browser/ui/singleton_tabs.cc -+++ b/chrome/browser/ui/singleton_tabs.cc -@@ -102,7 +102,8 @@ int GetIndexOfExistingTab(Browser* brows - // RewriteURLIfNecessary removes the "view-source:" scheme which could lead - // to incorrect matching, so ensure that the target and the candidate are - // either both view-source:, or neither is. -- if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source) { -+ if (tab_url.SchemeIs(content::kViewSourceScheme) != target_is_view_source || -+ tab_url.SchemeIs(url::kTraceScheme)) { +--- chrome/browser/ui/singleton_tabs.cc.orig ++++ chrome/browser/ui/singleton_tabs.cc +@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows + + // Skip view-source tabs. This is needed because RewriteURLIfNecessary + // removes the "view-source:" scheme which leads to incorrect matching. +- if (tab_url.SchemeIs(content::kViewSourceScheme)) ++ if (tab_url.SchemeIs(content::kViewSourceScheme) || ++ tab_url.SchemeIs(url::kTraceScheme)) continue; - } ---- a/components/omnibox/browser/autocomplete_input.cc -+++ b/components/omnibox/browser/autocomplete_input.cc -@@ -560,7 +560,8 @@ void AutocompleteInput::ParseForEmphasiz + GURL rewritten_tab_url = tab_url; +--- components/omnibox/browser/autocomplete_input.cc.orig ++++ components/omnibox/browser/autocomplete_input.cc +@@ -533,7 +533,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::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) || @@ -45,8 +45,8 @@ (static_cast(text.length()) > after_scheme_and_colon)) { // Obtain the URL prefixed by view-source or blob and parse it. std::u16string real_url(text.substr(after_scheme_and_colon)); ---- a/components/url_formatter/url_fixer.cc -+++ b/components/url_formatter/url_fixer.cc +--- components/url_formatter/url_fixer.cc.orig ++++ components/url_formatter/url_fixer.cc @@ -562,6 +562,10 @@ GURL FixupURL(const std::string& text, c } } @@ -58,19 +58,19 @@ // We handle the file scheme separately. if (scheme == url::kFileScheme) 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 -@@ -735,6 +735,7 @@ ChildProcessSecurityPolicyImpl::ChildPro - RegisterWebSafeScheme(url::kWssScheme); +--- content/browser/child_process_security_policy_impl.cc.orig ++++ content/browser/child_process_security_policy_impl.cc +@@ -861,6 +861,7 @@ ChildProcessSecurityPolicyImpl::ChildPro #endif // BUILDFLAG(ENABLE_WEBSOCKETS) + RegisterWebSafeScheme(url::kFtpScheme); RegisterWebSafeScheme(url::kDataScheme); + RegisterWebSafeScheme(url::kTraceScheme); + RegisterWebSafeScheme("feed"); // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed - // other origins, so we should not treat them as web safe. Remove callers of ---- a/net/BUILD.gn -+++ b/net/BUILD.gn -@@ -1004,6 +1004,8 @@ component("net") { +--- net/BUILD.gn.orig ++++ net/BUILD.gn +@@ -1010,6 +1010,8 @@ component("net") { "url_request/report_sender.h", "url_request/static_http_user_agent_settings.cc", "url_request/static_http_user_agent_settings.h", @@ -80,7 +80,7 @@ "url_request/url_fetcher.h", "url_request/url_fetcher_core.cc", --- /dev/null -+++ b/net/url_request/trk_protocol_handler.cc ++++ net/url_request/trk_protocol_handler.cc @@ -0,0 +1,25 @@ +// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -108,8 +108,8 @@ + +} // namespace net --- /dev/null -+++ b/net/url_request/trk_protocol_handler.h -@@ -0,0 +1,30 @@ ++++ net/url_request/trk_protocol_handler.h +@@ -0,0 +1,32 @@ +// Copyright (c) 2018 The ungoogled-chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -118,6 +118,7 @@ +#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ + +#include "base/compiler_specific.h" ++#include "base/macros.h" +#include "net/base/net_export.h" +#include "net/url_request/url_request_job_factory.h" + @@ -130,18 +131,19 @@ + : public URLRequestJobFactory::ProtocolHandler { + public: + TrkProtocolHandler(); -+ TrkProtocolHandler(const TrkProtocolHandler&) = delete; -+ TrkProtocolHandler& operator=(const TrkProtocolHandler&) = delete; + std::unique_ptr CreateJob( + URLRequest* request) const override; + bool IsSafeRedirectTarget(const GURL& location) const override; ++ ++ private: ++ DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler); +}; + +} // namespace net + +#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ ---- a/net/url_request/url_request.cc -+++ b/net/url_request/url_request.cc +--- net/url_request/url_request.cc.orig ++++ net/url_request/url_request.cc @@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/metrics/histogram_macros.h" @@ -150,7 +152,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "base/threading/thread_task_runner_handle.h" -@@ -45,6 +46,7 @@ +@@ -46,6 +47,7 @@ #include "net/url_request/url_request_redirect_job.h" #include "url/gurl.h" #include "url/origin.h" @@ -158,7 +160,7 @@ using base::Time; using std::string; -@@ -609,6 +611,12 @@ URLRequest::URLRequest(const GURL& url, +@@ -595,6 +597,12 @@ URLRequest::URLRequest(const GURL& url, // Sanity check out environment. DCHECK(base::ThreadTaskRunnerHandle::IsSet()); @@ -171,17 +173,17 @@ context->url_requests()->insert(this); net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] { return NetLogURLRequestConstructorParams(url, priority_, ---- a/net/url_request/url_request_context_builder.cc -+++ b/net/url_request/url_request_context_builder.cc -@@ -47,6 +47,7 @@ - #include "net/socket/network_binding_client_socket_factory.h" +--- net/url_request/url_request_context_builder.cc.orig ++++ net/url_request/url_request_context_builder.cc +@@ -46,6 +46,7 @@ + #include "net/quic/quic_stream_factory.h" #include "net/ssl/ssl_config_service_defaults.h" #include "net/url_request/static_http_user_agent_settings.h" +#include "net/url_request/trk_protocol_handler.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_job_factory.h" -@@ -628,6 +629,9 @@ std::unique_ptr URLRe +@@ -546,6 +547,9 @@ std::unique_ptr URLRe } protocol_handlers_.clear(); @@ -191,30 +193,28 @@ storage->set_job_factory(std::move(job_factory)); return std::move(context); ---- a/url/url_constants.cc -+++ b/url/url_constants.cc -@@ -46,6 +46,8 @@ const char kQuicTransportScheme[] = "qui - const char16_t kQuicTransportScheme16[] = u"quic-transport"; +--- url/url_constants.cc.orig ++++ url/url_constants.cc +@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto"; + // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport + const char kQuicTransportScheme[] = "quic-transport"; const char kTelScheme[] = "tel"; - const char16_t kTelScheme16[] = u"tel"; +const char kTraceScheme[] = "trk"; -+const char16_t kTraceScheme16[] = u"trk"; const char kUrnScheme[] = "urn"; - const char16_t kUrnScheme16[] = u"urn"; - const char kUuidInPackageScheme[] = "uuid-in-package"; ---- a/url/url_constants.h -+++ b/url/url_constants.h -@@ -50,6 +50,8 @@ COMPONENT_EXPORT(URL) extern const char - COMPONENT_EXPORT(URL) extern const char16_t kQuicTransportScheme16[]; + const char kWsScheme[] = "ws"; + const char kWssScheme[] = "wss"; +--- url/url_constants.h.orig ++++ url/url_constants.h +@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char + COMPONENT_EXPORT(URL) extern const char kMailToScheme[]; + COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[]; COMPONENT_EXPORT(URL) extern const char kTelScheme[]; - COMPONENT_EXPORT(URL) extern const char16_t kTelScheme16[]; +COMPONENT_EXPORT(URL) extern const char kTraceScheme[]; -+COMPONENT_EXPORT(URL) extern const char16_t kTraceScheme16[]; COMPONENT_EXPORT(URL) extern const char kUrnScheme[]; - COMPONENT_EXPORT(URL) extern const char16_t kUrnScheme16[]; - COMPONENT_EXPORT(URL) extern const char kUuidInPackageScheme[]; ---- a/url/url_util.cc -+++ b/url/url_util.cc + COMPONENT_EXPORT(URL) extern const char kWsScheme[]; + COMPONENT_EXPORT(URL) extern const char kWssScheme[]; +--- url/url_util.cc.orig ++++ url/url_util.cc @@ -63,7 +63,7 @@ struct SchemeRegistry { // Schemes that do not trigger mixed content warning. diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch index e23a778..a4b3c51 100644 --- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch +++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -1,8 +1,8 @@ # Disable some background communication with clients2.google.com ---- a/components/crash/core/app/crashpad_linux.cc -+++ b/components/crash/core/app/crashpad_linux.cc -@@ -60,8 +60,7 @@ void SetFirstChanceExceptionHandler(bool +--- components/crash/core/app/crashpad_linux.cc.orig ++++ components/crash/core/app/crashpad_linux.cc +@@ -59,8 +59,7 @@ void SetFirstChanceExceptionHandler(bool } bool IsCrashpadEnabled() { diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch index d342db3..adc446c 100644 --- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch +++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-domain-reliability.patch @@ -2,8 +2,8 @@ # Many of these changes are for thoroughness, # the most significant changes are in service_factory.cc and uploader.cc ---- a/chrome/browser/domain_reliability/service_factory.cc -+++ b/chrome/browser/domain_reliability/service_factory.cc +--- chrome/browser/domain_reliability/service_factory.cc.orig ++++ chrome/browser/domain_reliability/service_factory.cc @@ -11,34 +11,12 @@ namespace domain_reliability { @@ -40,8 +40,8 @@ } } // namespace domain_reliability ---- a/components/domain_reliability/BUILD.gn -+++ b/components/domain_reliability/BUILD.gn +--- components/domain_reliability/BUILD.gn.orig ++++ components/domain_reliability/BUILD.gn @@ -7,26 +7,6 @@ action("bake_in_configs") { script = "bake_in_configs.py" @@ -98,8 +98,8 @@ } component("domain_reliability") { ---- a/components/domain_reliability/bake_in_configs.py -+++ b/components/domain_reliability/bake_in_configs.py +--- components/domain_reliability/bake_in_configs.py.orig ++++ components/domain_reliability/bake_in_configs.py @@ -490,7 +490,7 @@ def origin_is_whitelisted(origin): domain = origin[8:-1] else: @@ -109,9 +109,9 @@ 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 @@ +--- components/domain_reliability/google_configs.cc.orig ++++ components/domain_reliability/google_configs.cc +@@ -11,564 +11,6 @@ namespace domain_reliability { @@ -402,6 +402,9 @@ - {"ampproject.net", true, false, false}, - {"ampproject.org", true, false, false}, - {"android.com", true, false, false}, +- {"anycast-edge.metric.gstatic.com", true, false, false}, +- {"anycast-stb.metric.gstatic.com", true, false, false}, +- {"anycast.metric.gstatic.com", true, false, false}, - {"cdn.ampproject.org", true, false, false}, - {"chromecast.com", true, false, false}, - {"chromeexperiments.com", true, false, false}, @@ -458,6 +461,19 @@ - {"picasa.com", true, false, false}, - {"recaptcha.net", true, false, false}, - {"stackdriver.com", true, false, false}, +- {"stbcast-stb.metric.gstatic.com", true, false, false}, +- {"stbcast.metric.gstatic.com", true, false, false}, +- {"stbcast2-stb.metric.gstatic.com", true, false, false}, +- {"stbcast2.metric.gstatic.com", true, false, false}, +- {"stbcast3-stb.metric.gstatic.com", true, false, false}, +- {"stbcast3.metric.gstatic.com", true, false, false}, +- {"stbcast4-stb.metric.gstatic.com", true, false, false}, +- {"stbcast4.metric.gstatic.com", true, false, false}, +- {"unicast-edge.metric.gstatic.com", true, false, false}, +- {"unicast-stb.metric.gstatic.com", true, false, false}, +- {"unicast.metric.gstatic.com", true, false, false}, +- {"unicast2-stb.metric.gstatic.com", true, false, false}, +- {"unicast2.metric.gstatic.com", true, false, false}, - {"waze.com", true, false, false}, - {"withgoogle.com", true, false, false}, - {"youtu.be", true, false, false}, @@ -660,7 +676,7 @@ std::unique_ptr MaybeGetGoogleConfig( const std::string& hostname) { bool is_www_subdomain = -@@ -562,23 +20,6 @@ std::unique_ptr config; std::unique_ptr superdomain_config; @@ -684,7 +700,7 @@ if (config) { DCHECK(config->origin.host() == hostname); return config; -@@ -597,11 +38,6 @@ std::vector> configs_out; @@ -696,9 +712,9 @@ return configs_out; } ---- a/components/domain_reliability/uploader.cc -+++ b/components/domain_reliability/uploader.cc -@@ -80,7 +80,7 @@ class DomainReliabilityUploaderImpl : pu +--- components/domain_reliability/uploader.cc.orig ++++ components/domain_reliability/uploader.cc +@@ -79,7 +79,7 @@ class DomainReliabilityUploaderImpl : pu if (discard_uploads_) discarded_upload_count_++; diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch new file mode 100644 index 0000000..3ef84c2 --- /dev/null +++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-floc.patch @@ -0,0 +1,78 @@ +--- chrome/browser/federated_learning/floc_id_provider_factory.cc.orig ++++ chrome/browser/federated_learning/floc_id_provider_factory.cc +@@ -49,42 +49,7 @@ FlocIdProviderFactory::~FlocIdProviderFa + + KeyedService* FlocIdProviderFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { +- if (!base::FeatureList::IsEnabled(kFederatedLearningOfCohorts)) +- return nullptr; +- +- Profile* profile = Profile::FromBrowserContext(context); +- +- syncer::SyncService* sync_service = +- SyncServiceFactory::GetForProfile(profile); +- if (!sync_service) +- return nullptr; +- +- PrivacySandboxSettings* privacy_sandbox_settings = +- PrivacySandboxSettingsFactory::GetForProfile(profile); +- if (!privacy_sandbox_settings) +- return nullptr; +- +- FlocRemotePermissionService* floc_remote_permission_service = +- FlocRemotePermissionServiceFactory::GetForProfile(profile); +- if (!floc_remote_permission_service) +- return nullptr; +- +- history::HistoryService* history_service = +- HistoryServiceFactory::GetForProfile(profile, +- ServiceAccessType::IMPLICIT_ACCESS); +- if (!history_service) +- return nullptr; +- +- syncer::UserEventService* user_event_service = +- browser_sync::UserEventServiceFactory::GetForProfile(profile); +- if (!user_event_service) +- return nullptr; +- +- auto floc_event_logger = std::make_unique( +- sync_service, floc_remote_permission_service, user_event_service); +- +- return new FlocIdProviderImpl(profile->GetPrefs(), privacy_sandbox_settings, +- history_service, std::move(floc_event_logger)); ++ return nullptr; + } + + } // namespace federated_learning +--- chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc.orig ++++ chrome/browser/privacy_sandbox/privacy_sandbox_settings.cc +@@ -132,8 +132,7 @@ bool ShouldDisablePrivacySandbox( + + // Returns whether FLoC is allowable by the current state of |pref_service|. + bool IsFlocAllowedByPrefs(PrefService* pref_service) { +- return pref_service->GetBoolean(prefs::kPrivacySandboxFlocEnabled) && +- pref_service->GetBoolean(prefs::kPrivacySandboxApisEnabled); ++ return false; + } + + // Returns the number of days in |time|, rounded to the closest day by hour if +@@ -207,7 +206,7 @@ PrivacySandboxSettings::PrivacySandboxSe + PrivacySandboxSettings::~PrivacySandboxSettings() = default; + + bool PrivacySandboxSettings::IsFlocAllowed() const { +- return IsFlocAllowedByPrefs(pref_service_); ++ return false; + } + + bool PrivacySandboxSettings::IsFlocAllowedForContext( +--- components/privacy_sandbox/privacy_sandbox_prefs.cc.orig ++++ components/privacy_sandbox/privacy_sandbox_prefs.cc +@@ -42,7 +42,7 @@ void RegisterProfilePrefs(PrefRegistrySi + registry->RegisterTimePref(prefs::kPrivacySandboxFlocDataAccessibleSince, + base::Time()); + registry->RegisterBooleanPref( +- prefs::kPrivacySandboxFlocEnabled, true, ++ prefs::kPrivacySandboxFlocEnabled, false, + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + } + diff --git a/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch index ebfc63a..e969364 100644 --- a/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch +++ b/www/chromium-uc/patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch @@ -1,7 +1,7 @@ # Disables references to fonts.googleapis.com ---- a/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html -+++ b/chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html +--- chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html.orig ++++ chrome/browser/ash/child_accounts/time_limits/web_time_limit_error_page/resources/web_time_limit_error_page.html @@ -5,7 +5,7 @@ @@ -11,8 +11,8 @@ ---- a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css -+++ b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css +--- chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css.orig ++++ chrome/browser/resources/chromeos/accessibility/chromevox/options/options.css @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -22,8 +22,8 @@ body { margin: 0 0 20px 0; ---- a/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css -+++ b/chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css +--- chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css.orig ++++ chrome/browser/resources/chromeos/accessibility/select_to_speak/options.css @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -33,8 +33,8 @@ body { margin: 0 0 20px 0; ---- a/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html -+++ b/chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html +--- chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html.orig ++++ chrome/browser/supervised_user/supervised_user_error_page/resources/supervised_user_block_interstitial.html @@ -5,7 +5,7 @@ @@ -44,9 +44,9 @@ ---- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc -@@ -298,7 +298,7 @@ bool DomDistillerViewerSource::ShouldSer +--- components/dom_distiller/content/browser/dom_distiller_viewer_source.cc.orig ++++ components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +@@ -300,7 +300,7 @@ bool DomDistillerViewerSource::ShouldSer std::string DomDistillerViewerSource::GetContentSecurityPolicy( network::mojom::CSPDirectiveName directive) { if (directive == network::mojom::CSPDirectiveName::StyleSrc) { @@ -55,8 +55,8 @@ } else if (directive == network::mojom::CSPDirectiveName::ChildSrc) { return "child-src *;"; } else if (directive == ---- a/components/dom_distiller/core/html/preview.html -+++ b/components/dom_distiller/core/html/preview.html +--- components/dom_distiller/core/html/preview.html.orig ++++ components/dom_distiller/core/html/preview.html @@ -11,7 +11,7 @@ found in the LICENSE file. Title goes here and it could be kind of lengthy - Publisher name @@ -66,8 +66,8 @@ -- +- + - -- +- +- @@ -209,8 +207,8 @@ - on-click="onAdvancedProtectionProgramLinkClick_" - external> - ---- a/chrome/browser/resources/settings/search_page/search_page.html -+++ b/chrome/browser/resources/settings/search_page/search_page.html +--- chrome/browser/resources/settings/search_page/search_page.html.orig ++++ chrome/browser/resources/settings/search_page/search_page.html @@ -12,10 +12,6 @@
@@ -222,9 +220,20 @@