diff --git a/build/patches/Disable-privacy-sandbox.patch b/build/patches/Disable-privacy-sandbox.patch index 76ace853..0bd77bbb 100644 --- a/build/patches/Disable-privacy-sandbox.patch +++ b/build/patches/Disable-privacy-sandbox.patch @@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../history/core/browser/history_backend.cc | 13 +------------ .../privacy_sandbox_attestations/BUILD.gn | 4 ---- .../preload/BUILD.gn | 2 +- - .../privacy_sandbox_attestations.cc | 2 -- + .../privacy_sandbox_attestations.cc | 8 +++----- .../privacy_sandbox_features.cc | 3 +++ .../privacy_sandbox/privacy_sandbox_prefs.cc | 4 ++-- .../privacy_sandbox_settings_impl.cc | 19 ++++++++++++++----- @@ -36,7 +36,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../features_cc/Disable-privacy-sandbox.inc | 1 + .../features_cc/Disable-privacy-sandbox.inc | 1 + third_party/blink/common/features.cc | 1 + - 26 files changed, 52 insertions(+), 41 deletions(-) + 26 files changed, 55 insertions(+), 44 deletions(-) create mode 100644 cromite_flags/content/common/features_cc/Disable-privacy-sandbox.inc create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-privacy-sandbox.inc create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-privacy-sandbox.inc @@ -246,6 +246,24 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/preload/BUI diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc --- a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc +++ b/components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.cc +@@ -41,7 +41,7 @@ + #include "net/base/schemeful_site.h" + #include "url/gurl.h" + +-#if BUILDFLAG(IS_ANDROID) ++#if ((false)) && BUILDFLAG(IS_ANDROID) + #include "base/android/apk_assets.h" + #include "base/containers/span.h" + #include "base/files/memory_mapped_file.h" +@@ -141,7 +141,7 @@ LoadAttestationsInternal(base::FilePath installed_file_path) { + return ParseAttestationsMap(proto_str); + } + +-#if BUILDFLAG(IS_ANDROID) ++#if ((false)) && BUILDFLAG(IS_ANDROID) + + void RecordLoadAPKAssetStatusHistogram(LoadAPKAssetStatus status) { + base::UmaHistogramEnumeration(kAttestationsLoadAPKAssetStatusUMA, status); @@ -467,8 +467,6 @@ void PrivacySandboxAttestations::OnAttestationsParsed( if (attestations_map.has_value() && (!file_version_.IsValid() || file_version_.CompareTo(version) < 0)) { @@ -255,6 +273,15 @@ diff --git a/components/privacy_sandbox/privacy_sandbox_attestations/privacy_san } SetIsPreInstalled(is_pre_installed); +@@ -494,7 +492,7 @@ void PrivacySandboxAttestations::OnAttestationsFileCheckComplete() { + // the in-memory attestations map. + // TODO(crbug.com/406020732): Consider also loading the attestations component + // from APK assets if the parsing has finished with error. +-#if BUILDFLAG(IS_ANDROID) ++#if ((false)) && BUILDFLAG(IS_ANDROID) + if (attestations_parse_progress_ == Progress::kNotStarted && + base::FeatureList::IsEnabled( + privacy_sandbox::kPrivacySandboxAttestationsLoadFromAPKAsset)) { diff --git a/components/privacy_sandbox/privacy_sandbox_features.cc b/components/privacy_sandbox/privacy_sandbox_features.cc --- a/components/privacy_sandbox/privacy_sandbox_features.cc +++ b/components/privacy_sandbox/privacy_sandbox_features.cc