Skip to content

Commit

Permalink
Update to Chromium 128.0.6613.84
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahrotahn committed Aug 21, 2024
1 parent 45d389b commit 2617072
Show file tree
Hide file tree
Showing 76 changed files with 1,504 additions and 1,431 deletions.
2 changes: 1 addition & 1 deletion chromium_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
127.0.6533.119
128.0.6613.84
554 changes: 210 additions & 344 deletions domain_substitution.list

Large diffs are not rendered by default.

183 changes: 48 additions & 135 deletions patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions patches/core/inox-patchset/0005-disable-default-extensions.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
--- a/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
+++ b/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc
@@ -31,7 +31,6 @@ namespace extensions {
@@ -32,7 +32,6 @@ namespace extensions {

bool IsComponentExtensionAllowlisted(const std::string& extension_id) {
const char* const kAllowed[] = {
- extension_misc::kInAppPaymentsSupportAppId,
extension_misc::kPdfExtensionId,
constexpr auto kAllowed = base::MakeFixedFlatSet<std::string_view>({
- extension_misc::kInAppPaymentsSupportAppId,
extension_misc::kPdfExtensionId,
#if BUILDFLAG(IS_CHROMEOS)
extension_misc::kAssessmentAssistantExtensionId,
extension_misc::kAssessmentAssistantExtensionId,
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -410,11 +410,6 @@ void ComponentLoader::AddWebStoreApp() {
Expand Down
2 changes: 1 addition & 1 deletion patches/core/inox-patchset/0021-disable-rlz.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ by default.
std::unique_ptr<network::SimpleURLLoader> 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
@@ -28,7 +28,7 @@ namespace safe_search_api {
@@ -27,7 +27,7 @@ namespace safe_search_api {
namespace {

const char kSafeSearchApiUrl[] =
Expand Down Expand Up @@ -391,7 +391,7 @@ by default.

--- a/content/browser/webauth/webauth_request_security_checker.h
+++ b/content/browser/webauth/webauth_request_security_checker.h
@@ -86,9 +86,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
@@ -87,9 +87,9 @@ class CONTENT_EXPORT WebAuthRequestSecur
// Legacy App IDs, which google.com origins are allowed to assert for
// compatibility reasons.
static constexpr char kGstaticAppId[] =
Expand Down Expand Up @@ -432,7 +432,7 @@ by default.
const char kExtensionsMenuUtmSource[] = "ext_extensions_menu";
--- a/google_apis/gaia/gaia_constants.cc
+++ b/google_apis/gaia/gaia_constants.cc
@@ -14,157 +14,157 @@ const char kChromeSource[] = "ChromiumBr
@@ -14,166 +14,166 @@ const char kChromeSource[] = "ChromiumBr
const char kUnexpectedServiceResponse[] = "UnexpectedServiceResponse";

// OAuth scopes.
Expand Down Expand Up @@ -495,6 +495,17 @@ by default.
- "https://www.googleapis.com/auth/peopleapi.readonly";
+ "trk:081:https://www.googleapis.com/auth/peopleapi.readonly";

// OAuth2 scope for access to the people API (read-write).
const char kPeopleApiReadWriteOAuth2Scope[] =
- "https://www.googleapis.com/auth/peopleapi.readwrite";
+ "trk:115:https://www.googleapis.com/auth/peopleapi.readwrite";

// OAuth2 scope for access to the people API person's locale preferences
// (read-only).
const char kProfileLanguageReadOnlyOAuth2Scope[] =
- "https://www.googleapis.com/auth/profile.language.read";
+ "trk:116:https://www.googleapis.com/auth/profile.language.read";

// OAuth2 scope for access to the programmatic challenge API (read-only).
const char kProgrammaticChallengeOAuth2Scope[] =
- "https://www.googleapis.com/auth/accounts.programmaticchallenge";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ the URL so we get notified if this happens again in the future).
kSafeBrowsingIncidentTrafficAnnotation =
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -304,11 +304,14 @@ IncidentReportingService::UploadContext:
@@ -305,11 +305,14 @@ IncidentReportingService::UploadContext:

// static
bool IncidentReportingService::IsEnabledForProfile(Profile* profile) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This prevents trk:148 (phishing) and trk:149 (malware).

--- a/components/safe_browsing/content/browser/client_side_detection_service.cc
+++ b/components/safe_browsing/content/browser/client_side_detection_service.cc
@@ -274,6 +274,10 @@ void ClientSideDetectionService::StartCl
@@ -271,6 +271,10 @@ void ClientSideDetectionService::StartCl
return;
}

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

@@ -353,6 +357,7 @@ void ClientSideDetectionService::StartCl
@@ -350,6 +354,7 @@ void ClientSideDetectionService::StartCl
base::BindOnce(&WebUIInfoSingleton::AddToClientPhishingRequestsSent,
base::Unretained(WebUIInfoSingleton::GetInstance()),
std::move(request), access_token));
Expand Down
24 changes: 12 additions & 12 deletions patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

--- a/components/omnibox/browser/autocomplete_input.cc
+++ b/components/omnibox/browser/autocomplete_input.cc
@@ -582,7 +582,8 @@ void AutocompleteInput::ParseForEmphasiz
@@ -592,7 +592,8 @@ void AutocompleteInput::ParseForEmphasiz
// For the view-source and blob schemes, we should emphasize the host of the
// URL qualified by the view-source or blob prefix.
if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
Expand All @@ -60,7 +60,7 @@
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -852,6 +852,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
@@ -855,6 +855,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
RegisterWebSafeScheme(url::kWssScheme);
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
RegisterWebSafeScheme(url::kDataScheme);
Expand All @@ -70,7 +70,7 @@
// other origins, so we should not treat them as web safe. Remove callers of
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -998,6 +998,8 @@ component("net") {
@@ -1030,6 +1030,8 @@ component("net") {
"url_request/referrer_policy.h",
"url_request/static_http_user_agent_settings.cc",
"url_request/static_http_user_agent_settings.h",
Expand Down Expand Up @@ -142,23 +142,23 @@
+#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -12,6 +12,7 @@
#include "base/functional/callback_helpers.h"
@@ -13,6 +13,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
#include "base/rand_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/task/single_thread_task_runner.h"
@@ -49,6 +50,7 @@
@@ -51,6 +52,7 @@
#include "net/url_request/url_request_redirect_job.h"
#include "url/gurl.h"
#include "url/origin.h"
+#include "url/url_constants.h"

namespace net {

@@ -605,6 +607,12 @@ URLRequest::URLRequest(base::PassKey<URL
@@ -618,6 +620,12 @@ URLRequest::URLRequest(base::PassKey<URL
// Sanity check out environment.
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());

Expand All @@ -173,15 +173,15 @@
return NetLogURLRequestConstructorParams(url, priority_,
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -48,6 +48,7 @@
@@ -49,6 +49,7 @@
#include "net/socket/network_binding_client_socket_factory.h"
#include "net/ssl/ssl_config_service_defaults.h"
#include "net/url_request/static_http_user_agent_settings.h"
+#include "net/url_request/trk_protocol_handler.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_job_factory.h"
#include "url/url_constants.h"
@@ -584,6 +585,9 @@ std::unique_ptr<URLRequestContext> URLRe
@@ -592,6 +593,9 @@ std::unique_ptr<URLRequestContext> URLRe
}
protocol_handlers_.clear();

Expand All @@ -193,7 +193,7 @@
if (cookie_deprecation_label_.has_value()) {
--- a/url/url_constants.h
+++ b/url/url_constants.h
@@ -52,6 +52,8 @@ inline constexpr char kMaterializedViewS
@@ -50,6 +50,8 @@ inline constexpr char kMaterializedViewS
inline constexpr char kSteamScheme[] = "steam";
inline constexpr char kTelScheme[] = "tel";
inline constexpr char16_t kTelScheme16[] = u"tel";
Expand All @@ -204,15 +204,15 @@
inline constexpr char kUuidInPackageScheme[] = "uuid-in-package";
--- a/url/url_util.cc
+++ b/url/url_util.cc
@@ -79,6 +79,7 @@ struct SchemeRegistry {
@@ -84,6 +84,7 @@ struct SchemeRegistry {
kWssScheme,
kDataScheme,
kAboutScheme,
+ kTraceScheme,
};

// Schemes that normal pages cannot link to or access (i.e., with the same
@@ -93,6 +94,7 @@ struct SchemeRegistry {
@@ -98,6 +99,7 @@ struct SchemeRegistry {
kAboutScheme,
kJavaScriptScheme,
kDataScheme,
Expand Down
4 changes: 2 additions & 2 deletions patches/core/ungoogled-chromium/disable-crash-reporter.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2576,24 +2576,6 @@ void ChromeContentBrowserClient::AppendE
@@ -2707,24 +2707,6 @@ void ChromeContentBrowserClient::AppendE
command_line->AppendSwitchASCII(switches::kMetricsClientID,
client_info->client_id);
}
Expand All @@ -29,7 +29,7 @@
if (logging::DialogsAreSuppressed())
--- a/components/crash/core/app/crashpad.cc
+++ b/components/crash/core/app/crashpad.cc
@@ -81,6 +81,12 @@ void InitializeDatabasePath(const base::
@@ -68,6 +68,12 @@ void InitializeDatabasePath(const base::
}

bool InitializeCrashpadImpl(bool initial_client,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@

--- a/components/domain_reliability/uploader.cc
+++ b/components/domain_reliability/uploader.cc
@@ -80,7 +80,7 @@ class DomainReliabilityUploaderImpl : pu
@@ -81,7 +81,7 @@ class DomainReliabilityUploaderImpl : pu
if (discard_uploads_)
discarded_upload_count_++;

Expand Down
2 changes: 1 addition & 1 deletion patches/core/ungoogled-chromium/disable-gaia.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -263,61 +263,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
@@ -264,61 +264,6 @@ void GaiaAuthFetcher::CreateAndStartGaia
network::mojom::CredentialsMode credentials_mode,
const net::NetworkTrafficAnnotationTag& traffic_annotation) {
DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
Expand Down
6 changes: 3 additions & 3 deletions patches/core/ungoogled-chromium/disable-gcm.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
@@ -449,6 +449,7 @@ void GCMClientImpl::StartGCM() {
@@ -450,6 +450,7 @@ void GCMClientImpl::StartGCM() {

void GCMClientImpl::InitializeMCSClient() {
DCHECK(network_connection_tracker_);
+ return;
std::vector<GURL> endpoints;
endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
@@ -653,28 +654,6 @@ void GCMClientImpl::RemoveHeartbeatInter
@@ -654,28 +655,6 @@ void GCMClientImpl::RemoveHeartbeatInter

void GCMClientImpl::StartCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
Expand Down Expand Up @@ -39,7 +39,7 @@
}

void GCMClientImpl::OnCheckinCompleted(
@@ -731,24 +710,6 @@ void GCMClientImpl::SetGServicesSettings
@@ -732,24 +711,6 @@ void GCMClientImpl::SetGServicesSettings

void GCMClientImpl::SchedulePeriodicCheckin() {
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@
bool IsGoogleHostname(const GURL& url) {
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -593,11 +593,7 @@ std::u16string TemplateURLRef::SearchTer
@@ -589,11 +589,7 @@ std::u16string TemplateURLRef::SearchTer
bool TemplateURLRef::HasGoogleBaseURLs(
const SearchTermsData& search_terms_data) const {
ParseIfNecessary(search_terms_data);
Expand Down Expand Up @@ -663,6 +663,17 @@
}

} // namespace variations
--- a/content/browser/preloading/prefetch/prefetch_container.cc
+++ b/content/browser/preloading/prefetch/prefetch_container.cc
@@ -745,7 +745,7 @@ void PrefetchContainer::AddRedirectHop(c
// some which are added by throttles). These aren't yet supported for
// prefetch, including browsing topics and client hints.
net::HttpRequestHeaders updated_headers;
- std::vector<std::string> headers_to_remove = {variations::kClientDataHeader};
+ std::vector<std::string> headers_to_remove;
updated_headers.SetHeader("Sec-Purpose",
GetSecPurposeHeaderValue(redirect_info.new_url));

--- a/net/base/url_util.cc
+++ b/net/base/url_util.cc
@@ -495,28 +495,6 @@ bool HasGoogleHost(const GURL& url) {
Expand Down
22 changes: 14 additions & 8 deletions patches/core/ungoogled-chromium/disable-mei-preload.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,25 @@

--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -375,7 +375,6 @@ if (!is_android && !is_mac) {
@@ -382,7 +382,6 @@ if (!is_android && !is_mac) {
}

data_deps += [
- "//chrome/browser/resources/media/mei_preload:component",
"//third_party/widevine/cdm",
]
if (invoker.collect_inputs_only) {
@@ -1222,7 +1221,6 @@ if (is_win) {
":optimization_guide_library",
":swiftshader_library",
":widevine_cdm_library",
- "//chrome/browser/resources/media/mei_preload:component_bundle",
]
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -96,11 +96,6 @@ group("resources") {
public_deps += [ "accessibility:reading_mode_gdocs_extension_resources" ]
}

if (is_chrome_branded) {
- if (is_mac) {
- public_deps += [
- "//chrome/browser/resources/media/mei_preload:component",
- ]
- }

if (is_win || is_mac || is_linux || is_chromeos_ash) {
public_deps += [ "connectors_internals:resources" ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -306,7 +306,7 @@ FinancialPing::PingResponse FinancialPin
@@ -311,7 +311,7 @@ FinancialPing::PingResponse FinancialPin
response->clear();

std::string url =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -107,7 +107,7 @@ void RegisterBrowserUserPrefs(user_prefs
@@ -111,7 +111,7 @@ void RegisterBrowserUserPrefs(user_prefs
registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -623,12 +623,6 @@ std::vector<url::Origin> ChromeContentBr
@@ -669,12 +669,6 @@ std::vector<url::Origin> ChromeContentBr
GetOriginsRequiringDedicatedProcess() {
std::vector<url::Origin> list;

Expand Down
2 changes: 1 addition & 1 deletion patches/core/ungoogled-chromium/doh-changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
DohProviderIij, base::FEATURE_ENABLED_BY_DEFAULT),
--- a/services/network/public/cpp/features.cc
+++ b/services/network/public/cpp/features.cc
@@ -119,12 +119,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
@@ -126,12 +126,7 @@ BASE_FEATURE(kSplitAuthCacheByNetworkIso
// Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
BASE_FEATURE(kDnsOverHttpsUpgrade,
"DnsOverHttpsUpgrade",
Expand Down
24 changes: 22 additions & 2 deletions patches/core/ungoogled-chromium/extensions-manifestv2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,16 @@
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
@@ -76,11 +76,6 @@ KeyedService* ManifestV2ExperimentManage
}
@@ -139,17 +139,6 @@ bool ManifestV2ExperimentManagerFactory:

// Determines the current stage of the MV2 deprecation experiments.
MV2ExperimentStage CalculateCurrentExperimentStage() {
- // Return the "highest" stage that is currently active for the user.
- if (base::FeatureList::IsEnabled(
- extensions_features::kExtensionManifestV2Disabled)) {
- return MV2ExperimentStage::kDisableWithReEnable;
- }
-
- if (base::FeatureList::IsEnabled(
- extensions_features::kExtensionManifestV2DeprecationWarning)) {
- return MV2ExperimentStage::kWarning;
Expand All @@ -91,3 +97,17 @@
return MV2ExperimentStage::kNone;
}

--- a/chrome/browser/ui/webui/extensions/extensions_ui.cc
+++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -468,9 +468,9 @@ content::WebUIDataSource* CreateAndAddEx
extensions_features::kExtensionsMenuAccessControlWithPermittedSites));
source->AddBoolean(
"safetyCheckShowReviewPanel",
- base::FeatureList::IsEnabled(features::kSafetyCheckExtensions));
+ false);
source->AddBoolean("safetyHubShowReviewPanel",
- base::FeatureList::IsEnabled(features::kSafetyHub));
+ false);

// MV2 deprecation.
auto* mv2_experiment_manager = ManifestV2ExperimentManager::Get(profile);
Loading

0 comments on commit 2617072

Please sign in to comment.