From 383d187a971d6195c672fe95075b8942bc2feef1 Mon Sep 17 00:00:00 2001
From: mkarolin <max@brave.com>
Date: Fri, 12 Feb 2021 17:28:16 -0500
Subject: [PATCH] Disables TrustTokens feature.

Also, disables the origin trial.

Fixes brave/brave-browser#13886
---
 app/brave_main_delegate.cc                                    | 1 +
 app/brave_main_delegate_browsertest.cc                        | 1 +
 .../blink/renderer/core/origin_trials/origin_trials.cc        | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
index ffb4a6fc6f80..f1a63d2910b0 100644
--- a/app/brave_main_delegate.cc
+++ b/app/brave_main_delegate.cc
@@ -223,6 +223,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     federated_learning::kFederatedLearningOfCohorts.name,
     federated_learning::kFlocIdComputedEventLogging.name,
     net::features::kFirstPartySets.name,
+    network::features::kTrustTokens.name,
     network_time::kNetworkTimeServiceQuerying.name,
 #if defined(OS_ANDROID)
     features::kWebNfc.name,
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index fc9138a93a38..0740d71cd978 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -81,6 +81,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
       &federated_learning::kFlocIdComputedEventLogging,
       &kEnableProfilePickerOnStartupFeature,
       &net::features::kFirstPartySets,
+      &network::features::kTrustTokens,
       &network_time::kNetworkTimeServiceQuerying,
   };
 
diff --git a/chromium_src/third_party/blink/renderer/core/origin_trials/origin_trials.cc b/chromium_src/third_party/blink/renderer/core/origin_trials/origin_trials.cc
index 468f87a287cf..ee276aece505 100644
--- a/chromium_src/third_party/blink/renderer/core/origin_trials/origin_trials.cc
+++ b/chromium_src/third_party/blink/renderer/core/origin_trials/origin_trials.cc
@@ -24,6 +24,7 @@ bool IsTrialDisabledInBrave(const StringView& trial_name) {
       "DigitalGoods",
       "SignedExchangeSubresourcePrefetch",
       "SubresourceWebBundles",
+      "TrustTokens",
   };
 
   if (base::Contains(kBraveDisabledTrialNames, trial_name)) {
@@ -38,10 +39,11 @@ bool IsTrialDisabledInBrave(const StringView& trial_name) {
 
 bool IsTrialDisabledInBrave(OriginTrialFeature feature) {
   // When updating also update the array in the overload above.
-  static const std::array<OriginTrialFeature, 3> kBraveDisabledTrialFeatures = {
+  static const std::array<OriginTrialFeature, 4> kBraveDisabledTrialFeatures = {
       OriginTrialFeature::kDigitalGoods,
       OriginTrialFeature::kSignedExchangeSubresourcePrefetch,
       OriginTrialFeature::kSubresourceWebBundles,
+      OriginTrialFeature::kTrustTokens,
   };
 
   return base::Contains(kBraveDisabledTrialFeatures, feature);