PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git apply results for 116.0.5845.82

Browse Source
This commit is contained in:
Carmelo Messina
2023-08-10 22:05:41 +02:00
parent 1b5b2306d3
commit a34bbac337
23 changed files with 101 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00Clear-CORS-Preflight-Cache-on-clearing-data.patch
+1 -1
View File
@@ -78,7 +78,7 @@ diff --git a/services/network/cors/preflight_result.cc b/services/network/cors/p
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1059,6 +1059,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
@@ -1070,6 +1070,8 @@ void NetworkContext::ClearHttpCache(base::Time start_time,
base::BindOnce(&NetworkContext::OnHttpCacheCleared,
base::Unretained(this), std::move(callback))));
build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch
+1 -1
View File
@@ -1520,7 +1520,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
import("//components/captive_portal/core/features.gni")
import("//components/enterprise/buildflags/buildflags.gni")
import("//components/feed/features.gni")
@@ -2543,10 +2542,6 @@ if (!is_android) {
@@ -2544,10 +2543,6 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
build/patches/00Internal-firewall.patch
+6 -6
View File
@@ -1532,7 +1532,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
#include "services/network/brokered_client_socket_factory.h"
#include "services/network/cookie_manager.h"
#include "services/network/cors/cors_url_loader_factory.h"
@@ -1555,6 +1556,9 @@ void NetworkContext::OnNewSCTAuditingReportSent() {
@@ -1566,6 +1567,9 @@ void NetworkContext::OnNewSCTAuditingReportSent() {
void NetworkContext::CreateUDPSocket(
mojo::PendingReceiver<mojom::UDPSocket> receiver,
mojo::PendingRemote<mojom::UDPSocketListener> listener) {
@@ -1542,7 +1542,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
socket_factory_->CreateUDPSocket(std::move(receiver), std::move(listener));
}
@@ -1567,6 +1571,17 @@ void NetworkContext::CreateRestrictedUDPSocket(
@@ -1578,6 +1582,17 @@ void NetworkContext::CreateRestrictedUDPSocket(
mojo::PendingRemote<mojom::UDPSocketListener> listener,
CreateRestrictedUDPSocketCallback callback) {
// SimpleHostResolver is transitively owned by |this|.
@@ -1560,7 +1560,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
socket_factory_->CreateRestrictedUDPSocket(
addr, mode, traffic_annotation, std::move(params), std::move(receiver),
std::move(listener), SimpleHostResolver::Create(this),
@@ -1579,6 +1594,17 @@ void NetworkContext::CreateTCPServerSocket(
@@ -1590,6 +1605,17 @@ void NetworkContext::CreateTCPServerSocket(
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
mojo::PendingReceiver<mojom::TCPServerSocket> receiver,
CreateTCPServerSocketCallback callback) {
@@ -1578,7 +1578,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
socket_factory_->CreateTCPServerSocket(
local_addr, std::move(options),
static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
@@ -1593,6 +1619,21 @@ void NetworkContext::CreateTCPConnectedSocket(
@@ -1604,6 +1630,21 @@ void NetworkContext::CreateTCPConnectedSocket(
mojo::PendingReceiver<mojom::TCPConnectedSocket> receiver,
mojo::PendingRemote<mojom::SocketObserver> observer,
CreateTCPConnectedSocketCallback callback) {
@@ -1600,7 +1600,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
socket_factory_->CreateTCPConnectedSocket(
local_addr, remote_addr_list, std::move(tcp_connected_socket_options),
static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
@@ -1604,6 +1645,20 @@ void NetworkContext::CreateTCPBoundSocket(
@@ -1615,6 +1656,20 @@ void NetworkContext::CreateTCPBoundSocket(
const net::MutableNetworkTrafficAnnotationTag& traffic_annotation,
mojo::PendingReceiver<mojom::TCPBoundSocket> receiver,
CreateTCPBoundSocketCallback callback) {
@@ -1621,7 +1621,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
socket_factory_->CreateTCPBoundSocket(
local_addr,
static_cast<net::NetworkTrafficAnnotationTag>(traffic_annotation),
@@ -1669,6 +1724,24 @@ void NetworkContext::CreateWebSocket(
@@ -1680,6 +1735,24 @@ void NetworkContext::CreateWebSocket(
mojo::PendingRemote<mojom::WebSocketAuthenticationHandler> auth_handler,
mojo::PendingRemote<mojom::TrustedHeaderClient> header_client,
const absl::optional<base::UnguessableToken>& throttling_profile_id) {
build/patches/00Partition-HSTS-cache-by-NAK.patch
+7 -7
View File
@@ -536,7 +536,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1817,17 +1817,19 @@ void NetworkContext::SetCorsOriginAccessListsForOrigin(
@@ -1828,17 +1828,19 @@ void NetworkContext::SetCorsOriginAccessListsForOrigin(
std::move(callback).Run();
}
@@ -559,7 +559,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
IsHSTSActiveForHostCallback callback) {
net::TransportSecurityState* security_state =
url_request_context_->transport_security_state();
@@ -1837,10 +1839,10 @@ void NetworkContext::IsHSTSActiveForHost(const std::string& host,
@@ -1848,10 +1850,10 @@ void NetworkContext::IsHSTSActiveForHost(const std::string& host,
return;
}
@@ -572,7 +572,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
GetHSTSStateCallback callback) {
base::Value::Dict result;
@@ -1876,10 +1878,10 @@ void NetworkContext::GetHSTSState(const std::string& domain,
@@ -1887,10 +1889,10 @@ void NetworkContext::GetHSTSState(const std::string& domain,
net::TransportSecurityState::STSState dynamic_sts_state;
net::TransportSecurityState::PKPState dynamic_pkp_state;
bool found_sts_dynamic = transport_security_state->GetDynamicSTSState(
@@ -585,7 +585,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
if (found_sts_dynamic) {
result.Set("dynamic_upgrade_mode",
static_cast<int>(dynamic_sts_state.upgrade_mode));
@@ -1915,6 +1917,7 @@ void NetworkContext::GetHSTSState(const std::string& domain,
@@ -1926,6 +1928,7 @@ void NetworkContext::GetHSTSState(const std::string& domain,
}
void NetworkContext::DeleteDynamicDataForHost(
@@ -593,7 +593,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
const std::string& host,
DeleteDynamicDataForHostCallback callback) {
net::TransportSecurityState* transport_security_state =
@@ -1925,7 +1928,7 @@ void NetworkContext::DeleteDynamicDataForHost(
@@ -1936,7 +1939,7 @@ void NetworkContext::DeleteDynamicDataForHost(
}
std::move(callback).Run(
@@ -602,7 +602,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
}
void NetworkContext::EnableStaticKeyPinningForTesting(
@@ -1966,7 +1969,7 @@ void NetworkContext::PreconnectSockets(
@@ -1977,7 +1980,7 @@ void NetworkContext::PreconnectSockets(
DCHECK(!require_network_anonymization_key_ ||
!network_anonymization_key.IsEmpty());
@@ -611,7 +611,7 @@ diff --git a/services/network/network_context.cc b/services/network/network_cont
// |PreconnectSockets| may receive arguments from the renderer, which is not
// guaranteed to validate them.
@@ -2756,12 +2759,15 @@ void NetworkContext::OnConnectionError() {
@@ -2767,12 +2770,15 @@ void NetworkContext::OnConnectionError() {
std::move(on_connection_close_callback_).Run(this);
}
build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch
+1 -1
View File
@@ -20,7 +20,7 @@ Subject: WIN ADDTO Experimental user scripts support
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3514,11 +3514,13 @@ static_library("browser") {
@@ -3517,11 +3517,13 @@ static_library("browser") {
]
deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
}
build/patches/00WIN-ADDTO-openH264--enable-ARM-ARM64-optimizati.patch
+1 -1
View File
@@ -9,7 +9,7 @@ Subject: WIN ADDTO openH264: enable ARM/ARM64 optimizati
diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
--- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
+++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
@@ -213,9 +213,9 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) {
@@ -212,9 +212,9 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) {
init_params.iRCMode = RC_OFF_MODE;
}
build/patches/Add-an-always-incognito-mode.patch
+5 -5
View File
@@ -2047,7 +2047,7 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_prov
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -262,6 +262,7 @@ const char* ContentSettingToString(ContentSetting setting) {
@@ -276,6 +276,7 @@ struct ContentSettingEntry {
HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
bool is_off_the_record,
@@ -2055,7 +2055,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
bool store_last_modified,
bool restore_session,
bool should_record_metrics)
@@ -271,6 +272,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
@@ -285,6 +286,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
#endif
prefs_(prefs),
is_off_the_record_(is_off_the_record),
@@ -2063,7 +2063,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
store_last_modified_(store_last_modified),
allow_invalid_secondary_pattern_for_testing_(false),
clock_(base::DefaultClock::GetInstance()) {
@@ -283,7 +285,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
@@ -297,7 +299,7 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
policy_provider->AddObserver(this);
auto pref_provider_ptr = std::make_unique<content_settings::PrefProvider>(
@@ -2075,7 +2075,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
--- a/components/content_settings/core/browser/host_content_settings_map.h
+++ b/components/content_settings/core/browser/host_content_settings_map.h
@@ -82,6 +82,7 @@ class HostContentSettingsMap : public content_settings::Observer,
@@ -103,6 +103,7 @@ class HostContentSettingsMap : public content_settings::Observer,
// profile or a guest session.
HostContentSettingsMap(PrefService* prefs,
bool is_off_the_record,
@@ -2083,7 +2083,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
bool store_last_modified,
bool restore_session,
bool should_record_metrics);
@@ -455,6 +456,8 @@ class HostContentSettingsMap : public content_settings::Observer,
@@ -507,6 +508,8 @@ class HostContentSettingsMap : public content_settings::Observer,
// Whether this settings map is for an incognito or guest session.
bool is_off_the_record_;
build/patches/Add-bookmark-import-export-actions.patch
+1 -1
View File
@@ -822,7 +822,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config:precompiled_headers",
@@ -3495,8 +3504,6 @@ static_library("browser") {
@@ -3498,8 +3507,6 @@ static_library("browser") {
"badging/badge_manager_factory.h",
"banners/app_banner_manager_desktop.cc",
"banners/app_banner_manager_desktop.h",
build/patches/Add-lifetime-options-for-permissions.patch
+20 -20
View File
@@ -140,15 +140,14 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/br
diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome/browser/permissions/one_time_permissions_tracker.cc
--- a/chrome/browser/permissions/one_time_permissions_tracker.cc
+++ b/chrome/browser/permissions/one_time_permissions_tracker.cc
@@ -16,8 +16,35 @@
@@ -18,8 +18,35 @@
#include "components/permissions/features.h"
#include "content/public/browser/visibility.h"
#include "url/gurl.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/content_settings/core/common/content_settings_utils.h"
+#include "components/permissions/permissions_client.h"
-OneTimePermissionsTracker::OneTimePermissionsTracker() = default;
+
+namespace {
+ // Remove all sessions content setting by origin and type
+ void RemoveSessionSettings(HostContentSettingsMap* content_settings,
@@ -171,13 +170,14 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
+ }
+ }
+}
+
-OneTimePermissionsTracker::OneTimePermissionsTracker() = default;
+OneTimePermissionsTracker::OneTimePermissionsTracker(content::BrowserContext* context)
+ : context_(context) {}
OneTimePermissionsTracker::~OneTimePermissionsTracker() = default;
OneTimePermissionsTracker::OriginTrackEntry::OriginTrackEntry() = default;
@@ -91,6 +118,11 @@ void OneTimePermissionsTracker::WebContentsUnloadedOrigin(
@@ -93,6 +120,11 @@ void OneTimePermissionsTracker::WebContentsUnloadedOrigin(
observer.OnLastPageFromOriginClosed(origin);
}
}
@@ -192,15 +192,15 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.cc b/chrome
diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/browser/permissions/one_time_permissions_tracker.h
--- a/chrome/browser/permissions/one_time_permissions_tracker.h
+++ b/chrome/browser/permissions/one_time_permissions_tracker.h
@@ -11,6 +11,7 @@
#include "base/observer_list.h"
@@ -12,6 +12,7 @@
#include "base/timer/timer.h"
#include "chrome/browser/permissions/one_time_permissions_tracker_observer.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
+#include "chrome/browser/profiles/profile.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/keyed_service/core/keyed_service.h"
#include "content/public/browser/visibility.h"
@@ -23,7 +24,7 @@ class OneTimePermissionsTracker : public KeyedService {
@@ -24,7 +25,7 @@ class OneTimePermissionsTracker : public KeyedService {
void (OneTimePermissionsTracker::*)(const url::Origin&);
public:
@@ -209,7 +209,7 @@ diff --git a/chrome/browser/permissions/one_time_permissions_tracker.h b/chrome/
~OneTimePermissionsTracker() override;
OneTimePermissionsTracker(const OneTimePermissionsTracker&) = delete;
@@ -118,7 +119,7 @@ class OneTimePermissionsTracker : public KeyedService {
@@ -127,7 +128,7 @@ class OneTimePermissionsTracker : public KeyedService {
base::ObserverList<OneTimePermissionsTrackerObserver> observer_list_;
std::map<url::Origin, OriginTrackEntry> origin_tracker_;
@@ -596,7 +596,7 @@ diff --git a/components/page_info/android/page_info_controller_android.cc b/comp
diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc
--- a/components/page_info/page_info.cc
+++ b/components/page_info/page_info.cc
@@ -1135,6 +1135,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
@@ -1141,6 +1141,8 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
permission_info.source = info.source;
permission_info.is_one_time = (info.metadata.session_model() ==
content_settings::SessionModel::OneTime);
@@ -1003,7 +1003,7 @@ diff --git a/components/permissions/contexts/geolocation_permission_context_andr
diff --git a/components/permissions/permission_context_base.cc b/components/permissions/permission_context_base.cc
--- a/components/permissions/permission_context_base.cc
+++ b/components/permissions/permission_context_base.cc
@@ -248,6 +248,20 @@ PermissionContextBase::CreatePermissionRequest(
@@ -250,6 +250,20 @@ PermissionContextBase::CreatePermissionRequest(
std::move(delete_callback));
}
@@ -1024,7 +1024,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
PermissionResult PermissionContextBase::GetPermissionStatus(
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
@@ -427,7 +441,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
@@ -429,7 +443,8 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
const GURL& embedding_origin,
ContentSetting content_setting,
bool is_one_time,
@@ -1034,7 +1034,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
content_setting == CONTENT_SETTING_BLOCK ||
content_setting == CONTENT_SETTING_DEFAULT);
@@ -442,13 +457,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
@@ -444,13 +459,14 @@ void PermissionContextBase::PermissionDecided(const PermissionRequestID& id,
// missing if a permission prompt was preignored and we already notified an
// origin about it.
if (request->second.second) {
@@ -1053,7 +1053,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
}
}
@@ -500,11 +516,27 @@ void PermissionContextBase::NotifyPermissionSet(
@@ -502,11 +518,27 @@ void PermissionContextBase::NotifyPermissionSet(
ContentSetting content_setting,
bool is_one_time,
bool is_final_decision) {
@@ -1082,7 +1082,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
}
if (is_final_decision) {
@@ -534,6 +566,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
@@ -536,6 +568,15 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
const GURL& embedding_origin,
ContentSetting content_setting,
bool is_one_time) {
@@ -1098,7 +1098,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
DCHECK_EQ(requesting_origin, requesting_origin.DeprecatedGetOriginAsURL());
DCHECK_EQ(embedding_origin, embedding_origin.DeprecatedGetOriginAsURL());
DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
@@ -543,6 +584,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
@@ -545,6 +586,8 @@ void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
constraints.set_session_model(is_one_time
? content_settings::SessionModel::OneTime
: content_settings::SessionModel::Durable);
@@ -1110,7 +1110,7 @@ diff --git a/components/permissions/permission_context_base.cc b/components/perm
diff --git a/components/permissions/permission_context_base.h b/components/permissions/permission_context_base.h
--- a/components/permissions/permission_context_base.h
+++ b/components/permissions/permission_context_base.h
@@ -138,6 +138,15 @@ class PermissionContextBase : public content_settings::Observer {
@@ -143,6 +143,15 @@ class PermissionContextBase : public content_settings::Observer {
// Updates stored content setting if persist is set, updates tab indicators
// and runs the callback to finish the request.
@@ -1126,7 +1126,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
virtual void NotifyPermissionSet(const PermissionRequestID& id,
const GURL& requesting_origin,
const GURL& embedding_origin,
@@ -159,6 +168,11 @@ class PermissionContextBase : public content_settings::Observer {
@@ -164,6 +173,11 @@ class PermissionContextBase : public content_settings::Observer {
// Store the decided permission as a content setting.
// virtual since the permission might be stored with different restrictions
// (for example for desktop notifications).
@@ -1138,7 +1138,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
virtual void UpdateContentSetting(const GURL& requesting_origin,
const GURL& embedding_origin,
ContentSetting content_setting,
@@ -191,6 +205,14 @@ class PermissionContextBase : public content_settings::Observer {
@@ -196,6 +210,14 @@ class PermissionContextBase : public content_settings::Observer {
PermissionRequest::PermissionDecidedCallback permission_decided_callback,
base::OnceClosure delete_callback) const;
@@ -1153,7 +1153,7 @@ diff --git a/components/permissions/permission_context_base.h b/components/permi
ContentSettingsType content_settings_type() const {
return content_settings_type_;
}
@@ -217,7 +239,8 @@ class PermissionContextBase : public content_settings::Observer {
@@ -222,7 +244,8 @@ class PermissionContextBase : public content_settings::Observer {
const GURL& embedding_origin,
ContentSetting content_setting,
bool is_one_time,
build/patches/Allow-building-without-supervised-users.patch
+2 -2
View File
@@ -36,7 +36,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3000,8 +3000,6 @@ static_library("browser") {
@@ -3003,8 +3003,6 @@ static_library("browser") {
"feed/android/refresh_task_scheduler_impl.cc",
"feed/android/refresh_task_scheduler_impl.h",
"feed/android/web_feed_bridge.cc",
@@ -45,7 +45,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"file_select_helper_contacts_android.cc",
"file_select_helper_contacts_android.h",
"first_run/android/first_run_prefs.cc",
@@ -3216,10 +3214,6 @@ static_library("browser") {
@@ -3219,10 +3217,6 @@ static_library("browser") {
"ssl/chrome_security_state_model_delegate.h",
"ssl/known_interception_disclosure_infobar.cc",
"ssl/known_interception_disclosure_infobar.h",
build/patches/Content-settings-infrastructure.patch
+32 -28
View File
@@ -46,13 +46,14 @@ Require: bromite-build-utils.patch
.../content_settings/core/browser/BUILD.gn | 7 +
.../bromite_content_settings/placeholder.txt | 1 +
.../core/browser/content_settings_registry.cc | 3 +
.../core/browser/content_settings_uma_util.cc | 3 +-
.../core/browser/content_settings_utils.cc | 12 +
.../core/browser/website_settings_info.h | 35 ++
.../core/browser/website_settings_registry.cc | 6 +
.../core/browser/website_settings_registry.h | 1 +
.../content_settings/core/common/BUILD.gn | 7 +
.../bromite_content_settings/placeholder.txt | 1 +
.../core/common/content_settings.cc | 21 +-
.../core/common/content_settings.cc | 18 +
.../core/common/content_settings.h | 10 +
.../core/common/content_settings.mojom | 6 +
.../common/content_settings_mojom_traits.cc | 12 +-
@@ -71,7 +72,7 @@ Require: bromite-build-utils.patch
.../execution_context/execution_context.cc | 16 +
.../execution_context/execution_context.h | 5 +
.../WebLayerSiteSettingsDelegate.java | 3 +
60 files changed, 1310 insertions(+), 41 deletions(-)
61 files changed, 1310 insertions(+), 41 deletions(-)
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting_README.md
@@ -390,7 +391,7 @@ diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -1980,6 +1980,7 @@ static_library("ui") {
@@ -1981,6 +1981,7 @@ static_library("ui") {
"//components/commerce/core:shopping_service",
"//components/commerce/core/mojom:mojo_bindings",
"//components/commerce/core/webui",
@@ -1787,7 +1788,7 @@ diff --git a/components/content_settings/android/BUILD.gn b/components/content_s
diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
--- a/components/content_settings/core/browser/BUILD.gn
+++ b/components/content_settings/core/browser/BUILD.gn
@@ -80,6 +80,13 @@ static_library("browser") {
@@ -83,6 +83,13 @@ static_library("browser") {
}
configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -1827,6 +1828,20 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.
}
void ContentSettingsRegistry::Register(
diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc
--- a/components/content_settings/core/browser/content_settings_uma_util.cc
+++ b/components/content_settings/core/browser/content_settings_uma_util.cc
@@ -171,8 +171,9 @@ void RecordContentSettingsHistogram(const std::string& name,
}
int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) {
+ if ((true)) return 0;
static_assert(kHistogramValue.size() ==
- static_cast<size_t>(ContentSettingsType::NUM_TYPES),
+ static_cast<size_t>(ContentSettingsType::NUM_TYPES_CHROMIUM),
"Update content settings histogram lookup");
auto* found = kHistogramValue.find(content_setting);
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -1961,7 +1976,7 @@ new file mode 100644
diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc
--- a/components/content_settings/core/common/content_settings.cc
+++ b/components/content_settings/core/common/content_settings.cc
@@ -16,6 +16,7 @@
@@ -15,6 +15,7 @@
#include "components/content_settings/core/common/content_settings_metadata.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/content_settings/core/common/content_settings_utils.h"
@@ -1969,18 +1984,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
namespace {
@@ -162,8 +163,9 @@ void RecordContentSettingsHistogram(const char* name,
}
int ContentSettingTypeToHistogramValue(ContentSettingsType content_setting) {
+ if ((true)) return 0;
static_assert(kHistogramValue.size() ==
- static_cast<size_t>(ContentSettingsType::NUM_TYPES),
+ static_cast<size_t>(ContentSettingsType::NUM_TYPES_CHROMIUM),
"Update content settings histogram lookup");
auto* found = kHistogramValue.find(content_setting);
@@ -231,6 +233,13 @@ bool ContentSettingPatternSource::operator==(
@@ -92,6 +93,13 @@ bool ContentSettingPatternSource::operator==(
// static
bool RendererContentSettingRules::IsRendererContentSetting(
ContentSettingsType content_type) {
@@ -1994,7 +1998,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
return content_type == ContentSettingsType::IMAGES ||
content_type == ContentSettingsType::JAVASCRIPT ||
content_type == ContentSettingsType::POPUPS ||
@@ -240,6 +249,9 @@ bool RendererContentSettingRules::IsRendererContentSetting(
@@ -101,6 +109,9 @@ bool RendererContentSettingRules::IsRendererContentSetting(
void RendererContentSettingRules::FilterRulesByOutermostMainFrameURL(
const GURL& outermost_main_frame_url) {
@@ -2004,7 +2008,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
FilterRulesForType(image_rules, outermost_main_frame_url);
FilterRulesForType(script_rules, outermost_main_frame_url);
FilterRulesForType(popup_redirect_rules, outermost_main_frame_url);
@@ -271,3 +283,10 @@ bool RendererContentSettingRules::operator==(
@@ -132,3 +143,10 @@ bool RendererContentSettingRules::operator==(
other.popup_redirect_rules, other.mixed_content_rules,
other.auto_dark_content_rules);
}
@@ -2018,7 +2022,7 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/compo
diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
--- a/components/content_settings/core/common/content_settings.h
+++ b/components/content_settings/core/common/content_settings.h
@@ -74,10 +74,20 @@ struct ContentSettingPatternSource {
@@ -66,10 +66,20 @@ struct ContentSettingPatternSource {
typedef std::vector<ContentSettingPatternSource> ContentSettingsForOneType;
@@ -2293,8 +2297,8 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
+#include "components/content_settings/core/browser/website_settings_registry.h"
#include "components/content_settings/browser/ui/cookie_controls_controller.h"
#include "components/content_settings/core/browser/content_settings_registry.h"
#include "components/content_settings/core/browser/content_settings_utils.h"
@@ -1187,6 +1188,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
#include "components/content_settings/core/browser/content_settings_uma_util.h"
@@ -1193,6 +1194,14 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info,
// applies to permissions listed in |kPermissionType|.
bool PageInfo::ShouldShowPermission(
const PageInfo::PermissionInfo& info) const {
@@ -2309,7 +2313,7 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
// Note |ContentSettingsType::ADS| will show up regardless of its default
// value when it has been activated on the current origin.
if (info.type == ContentSettingsType::ADS) {
@@ -1275,7 +1284,19 @@ void PageInfo::PresentSitePermissions() {
@@ -1281,7 +1290,19 @@ void PageInfo::PresentSitePermissions() {
HostContentSettingsMap* content_settings = GetContentSettings();
DCHECK(web_contents_);
@@ -2333,15 +2337,15 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.
diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc
--- a/components/page_info/page_info_ui.cc
+++ b/components/page_info/page_info_ui.cc
@@ -12,6 +12,7 @@
#include "base/strings/utf_string_conversions.h"
@@ -13,6 +13,7 @@
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
#include "components/content_settings/core/common/content_settings.h"
+#include "components/content_settings/core/browser/website_settings_registry.h"
#include "components/omnibox/common/omnibox_features.h"
#include "components/page_info/core/features.h"
#include "components/page_info/page_info.h"
@@ -575,6 +576,12 @@ PageInfoUI::~PageInfoUI() = default;
@@ -576,6 +577,12 @@ PageInfoUI::~PageInfoUI() = default;
// static
std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
@@ -2354,7 +2358,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
if (info.type == type)
return l10n_util::GetStringUTF16(info.string_id);
@@ -586,6 +593,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
@@ -587,6 +594,12 @@ std::u16string PageInfoUI::PermissionTypeToUIString(ContentSettingsType type) {
// static
std::u16string PageInfoUI::PermissionTypeToUIStringMidSentence(
ContentSettingsType type) {
@@ -2367,7 +2371,7 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_in
for (const PermissionUIInfo& info : GetContentSettingsUIInfo()) {
if (info.type == type)
return l10n_util::GetStringUTF16(info.string_id_mid_sentence);
@@ -975,6 +988,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
@@ -977,6 +990,11 @@ bool PageInfoUI::ContentSettingsTypeInPageInfo(ContentSettingsType type) {
if (info.type == type)
return true;
}
build/patches/Disable-all-promo-dialogs.patch
+1 -1
View File
@@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
--- a/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
+++ b/chrome/browser/ui/views/user_education/browser_feature_promo_controller.cc
@@ -61,6 +61,7 @@ ui::ElementContext BrowserFeaturePromoController::GetAnchorContext() const {
@@ -63,6 +63,7 @@ ui::ElementContext BrowserFeaturePromoController::GetAnchorContext() const {
bool BrowserFeaturePromoController::CanShowPromo(
ui::TrackedElement* anchor_element) const {
build/patches/Disable-safety-check.patch
+1 -1
View File
@@ -119,7 +119,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3311,7 +3311,6 @@ static_library("browser") {
@@ -3314,7 +3314,6 @@ static_library("browser") {
"//chrome/browser/reading_list/android",
"//chrome/browser/recent_tabs:jni_headers",
"//chrome/browser/safe_browsing/android:safe_browsing_enums",
build/patches/Disable-smart-selection-by-default.patch
+1 -1
View File
@@ -86,7 +86,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java
@@ -904,7 +904,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
@@ -884,7 +884,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
*/
@Override
public boolean canWebSearch() {
build/patches/Enable-Certificate-Transparency.patch
+1 -1
View File
@@ -169,7 +169,7 @@ diff --git a/net/url_request/report_sender.cc b/net/url_request/report_sender.cc
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -2613,7 +2613,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2624,7 +2624,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
// TransportSecurityState. Since no requests have been made yet, safe to do
// this even after the call to Build().
build/patches/Enable-native-Android-autofill.patch
+1 -1
View File
@@ -318,7 +318,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2524,6 +2524,13 @@ static_library("browser") {
@@ -2528,6 +2528,13 @@ static_library("browser") {
deps += [ "//chrome/browser/error_reporting" ]
}
build/patches/Experimental-user-scripts-support.patch
+1 -1
View File
@@ -321,7 +321,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3475,6 +3475,11 @@ static_library("browser") {
@@ -3478,6 +3478,11 @@ static_library("browser") {
]
deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
}
build/patches/Timezone-customization.patch
+3 -3
View File
@@ -726,7 +726,7 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc
diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -628,6 +628,14 @@ void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) {
@@ -659,6 +659,14 @@ void HostContentSettingsMap::SetClockForTesting(base::Clock* clock) {
provider->SetClockForTesting(clock);
}
@@ -744,7 +744,7 @@ diff --git a/components/content_settings/core/browser/host_content_settings_map.
diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
--- a/components/content_settings/core/browser/host_content_settings_map.h
+++ b/components/content_settings/core/browser/host_content_settings_map.h
@@ -344,6 +344,9 @@ class HostContentSettingsMap : public content_settings::Observer,
@@ -365,6 +365,9 @@ class HostContentSettingsMap : public content_settings::Observer,
allow_invalid_secondary_pattern_for_testing_ = allow;
}
@@ -764,7 +764,7 @@ new file mode 100644
diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h
--- a/components/content_settings/core/common/content_settings.h
+++ b/components/content_settings/core/common/content_settings.h
@@ -110,6 +110,7 @@ struct RendererContentSettingRules {
@@ -102,6 +102,7 @@ struct RendererContentSettingRules {
ContentSettingsForOneType popup_redirect_rules;
ContentSettingsForOneType mixed_content_rules;
ContentSettingsForOneType auto_dark_content_rules;
build/patches/User-agent-customization.patch
+1 -1
View File
@@ -1187,7 +1187,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
#include "base/check_op.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
@@ -2932,6 +2933,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
@@ -2939,6 +2940,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
#else
prefs.viewport_meta_enabled = false;
#endif
build/patches/eyeo-beta-114.0.5735.53-v1-base.patch
+9 -9
View File
@@ -1093,7 +1093,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/assist_ranker",
"//components/autofill/content/browser",
"//components/autofill/core/browser",
@@ -2582,6 +2607,18 @@ static_library("browser") {
@@ -2586,6 +2611,18 @@ static_library("browser") {
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -1112,7 +1112,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/android_theme_resources.h",
"android/autocomplete/tab_matcher_android.cc",
"android/autocomplete/tab_matcher_android.h",
@@ -3262,6 +3299,7 @@ static_library("browser") {
@@ -3265,6 +3302,7 @@ static_library("browser") {
"webauthn/android/webauthn_request_delegate_android.cc",
"webauthn/android/webauthn_request_delegate_android.h",
]
@@ -7563,7 +7563,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/autofill/content/browser:test_support",
"//components/back_forward_cache:back_forward_cache",
"//components/browsing_data/core:core",
@@ -1416,6 +1421,7 @@ if (!is_android) {
@@ -1417,6 +1422,7 @@ if (!is_android) {
"//chrome/test/data/webui/mojo:mojo_bindings",
"//chrome/test/media_router/access_code_cast:access_code_cast_integration_base",
"//chrome/test/payments:test_support",
@@ -7571,7 +7571,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/autofill/content/browser:risk_proto",
"//components/autofill/content/browser:test_support",
"//components/autofill/content/common/mojom",
@@ -1728,6 +1734,7 @@ if (!is_android) {
@@ -1729,6 +1735,7 @@ if (!is_android) {
"data/",
"//ash/components/arc/test/data/icons",
"//chrome/browser/page_load_metrics/integration_tests/data/",
@@ -7579,7 +7579,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//chrome/test/data/cart/",
"//components/test/data/ad_tagging/",
"//components/test/data/ads_observer/",
@@ -1819,6 +1826,15 @@ if (!is_android) {
@@ -1820,6 +1827,15 @@ if (!is_android) {
"../browser/accessibility/image_annotation_browsertest.cc",
"../browser/accessibility/interstitial_accessibility_browsertest.cc",
"../browser/accessibility/page_colors_browsertest.cc",
@@ -7595,7 +7595,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/apps/guest_view/app_view_browsertest.cc",
"../browser/apps/guest_view/web_view_browsertest.cc",
"../browser/apps/platform_apps/app_browsertest.cc",
@@ -2527,6 +2543,10 @@ if (!is_android) {
@@ -2528,6 +2544,10 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
@@ -7606,7 +7606,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
if (enable_reporting) {
sources += [ "../browser/net/reporting_browsertest.cc" ]
}
@@ -5605,6 +5625,7 @@ test("unit_tests") {
@@ -5606,6 +5626,7 @@ test("unit_tests") {
# All unittests in browser, common, renderer and service.
"../browser/about_flags_unittest.cc",
"../browser/active_use_util_unittest.cc",
@@ -7614,7 +7614,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/after_startup_task_utils_unittest.cc",
"../browser/apps/icon_standardizer_unittest.cc",
"../browser/apps/user_type_filter_unittest.cc",
@@ -6224,6 +6245,8 @@ test("unit_tests") {
@@ -6225,6 +6246,8 @@ test("unit_tests") {
"//chrome/services/file_util:unit_tests",
"//chrome/services/qrcode_generator/public/cpp",
"//components/account_id",
@@ -7623,7 +7623,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/assist_ranker/proto",
"//components/autofill/content/browser:test_support",
"//components/background_sync",
@@ -9578,6 +9601,7 @@ if (!is_android) {
@@ -9580,6 +9603,7 @@ if (!is_android) {
public_deps = [
"//chrome/browser:test_support_ui",
build/patches/eyeo-beta-114.0.5735.53-v1-extension_api.patch
+1 -1
View File
@@ -4260,7 +4260,7 @@ diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/c
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -3353,6 +3353,12 @@ if (!is_android) {
@@ -3354,6 +3354,12 @@ if (!is_android) {
"//chrome/browser/extensions/api:native_messaging_test_echo_&_host",
]
}
build/patches/openH264-enable-ARM-ARM64-optimizations.patch
+1 -1
View File
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
--- a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
+++ b/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc
@@ -213,11 +213,11 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) {
@@ -212,11 +212,11 @@ bool H264Encoder::ConfigureEncoder(const gfx::Size& size) {
init_params.iRCMode = RC_OFF_MODE;
}
build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+3 -3
View File
@@ -90,7 +90,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/headless",
"//chrome/common",
"//chrome/common:buildflags",
@@ -7554,8 +7548,6 @@ static_library("browser") {
@@ -7557,8 +7551,6 @@ static_library("browser") {
"supervised_user/kids_chrome_management/kids_profile_manager.h",
"supervised_user/supervised_user_browser_utils.cc",
"supervised_user/supervised_user_browser_utils.h",
@@ -776,7 +776,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -6180,7 +6180,6 @@ test("unit_tests") {
@@ -6181,7 +6181,6 @@ test("unit_tests") {
"//chrome/browser/favicon",
"//chrome/browser/feature_guide/notifications:unit_tests",
"//chrome/browser/first_party_sets",
@@ -1678,7 +1678,7 @@ diff --git a/net/base/url_util.cc b/net/base/url_util.cc
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -2663,7 +2663,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2674,7 +2674,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
}
#endif // BUILDFLAG(IS_CT_SUPPORTED)