Disable conversion measurement api: fix crash with delete on-device data when...

 .../Disable-conversion-measurement-api.inc    |   2 +

 .../Disable-conversion-measurement-api.inc    |   8 +

 .../attribution/request_headers_internal.cc   |   1 +

 services/network/network_context.cc           |  20 -

 services/network/network_context.cc           |  24 +-

 .../network/public/cpp/attribution_utils.cc   |   2 +

 .../core/frame/attribution_src_loader.cc      |   2 -

 third_party/blink/renderer/core/page/page.cc  |   2 +-

 .../platform/runtime_enabled_features.json5   |  20 +-

 ui/events/android/motion_event_android.cc     |   8 +-

 36 files changed, 100 insertions(+), 430 deletions(-)

 36 files changed, 104 insertions(+), 430 deletions(-)

 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

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

@@ -2683,26 +2683,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(

@@ -1268,6 +1268,10 @@ void NetworkContext::ClearTrustTokenData(mojom::ClearDataFilterPtr filter,

 void NetworkContext::ClearTrustTokenSessionOnlyData(

     ClearTrustTokenSessionOnlyDataCallback callback) {

+  if (!trust_token_store_) {

+    std::move(callback).Run(false);

+    return;

+  }

   // Only called when Private State Tokens is enabled, i.e.,

   // `trust_token_store_` is non-null.

   DCHECK(trust_token_store_);

@@ -2683,26 +2687,6 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(

     builder.set_network_quality_estimator(

         network_service_->network_quality_estimator());

   }