AUTOMATED - git apply results

uazo · Nov 29, 2023 · 3c17e9d · 3c17e9d
1 parent a43932d
commit 3c17e9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/build/patches/Add-site-engagement-flag.patch b/build/patches/Add-site-engagement-flag.patch
@@ -12,8 +12,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  components/site_engagement/core/BUILD.gn      |  6 ++++
  components/site_engagement/core/features.cc   | 30 ++++++++++++++++
  components/site_engagement/core/features.h    | 34 +++++++++++++++++++
- .../Add-site-engagement-flag.inc              | 11 ++++++
- 6 files changed, 87 insertions(+)
+ .../Add-site-engagement-flag.inc              | 10 ++++++
+ 6 files changed, 86 insertions(+)
  create mode 100644 components/site_engagement/core/features.cc
  create mode 100644 components/site_engagement/core/features.h
  create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc
@@ -147,7 +147,7 @@ diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-fla
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/chrome/browser/about_flags_cc/Add-site-engagement-flag.inc
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,10 @@
 +#ifdef FLAG_SECTION
 +
 +    {"site-engagement",
@@ -158,6 +158,5 @@ new file mode 100644
 +     FEATURE_VALUE_TYPE(site_engagement::features::kSiteEngagement)},
 +
 +#endif
-+
 --
 2.25.1
diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch
@@ -30,11 +30,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
  content/renderer/render_thread_impl.cc        |   5 +-
  .../Disable-conversion-measurement-api.inc    |   1 +
  .../Disable-conversion-measurement-api.inc    |   1 +
- .../Disable-conversion-measurement-api.inc    |  10 +
+ .../Disable-conversion-measurement-api.inc    |   9 +
  .../attribution/request_headers_internal.cc   |   1 +
  .../network/public/cpp/attribution_utils.cc   |   2 +
  ui/events/android/motion_event_android.cc     |   6 +-
- 23 files changed, 68 insertions(+), 241 deletions(-)
+ 23 files changed, 67 insertions(+), 241 deletions(-)
  create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-conversion-measurement-api.inc
  create mode 100644 cromite_flags/services/network/public/cpp/features_cc/Disable-conversion-measurement-api.inc
  create mode 100644 cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
@@ -612,7 +612,7 @@ diff --git a/cromite_flags/third_party/blink/common/features_cc/Disable-conversi
 new file mode 100644
 --- /dev/null
 +++ b/cromite_flags/third_party/blink/common/features_cc/Disable-conversion-measurement-api.inc
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,9 @@
 +SET_CROMITE_FEATURE_DISABLED(kAdAuctionReportingWithMacroApi);
 +SET_CROMITE_FEATURE_DISABLED(kAdAuctionSignals);
 +SET_CROMITE_FEATURE_DISABLED(kBrowsingTopics);
@@ -622,7 +622,6 @@ new file mode 100644
 +SET_CROMITE_FEATURE_DISABLED(kInterestGroupStorage);
 +SET_CROMITE_FEATURE_DISABLED(kPrivacySandboxAdsAPIs);
 +SET_CROMITE_FEATURE_DISABLED(kPrivateAggregationApi);
-+
 diff --git a/services/network/attribution/request_headers_internal.cc b/services/network/attribution/request_headers_internal.cc
 --- a/services/network/attribution/request_headers_internal.cc
 +++ b/services/network/attribution/request_headers_internal.cc