From 522fc78bad407d1091379185e901e29d48224b9f 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 feature in blink and origin trials.

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 +++-
 renderer/brave_content_renderer_client.cc                     | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
index a2a8a8a4702c..7f8f66b2b351 100644
--- a/app/brave_main_delegate.cc
+++ b/app/brave_main_delegate.cc
@@ -229,6 +229,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     features::kSubresourceWebBundles.name,
     features::kTabHoverCards.name,
     features::kWebOTP.name,
+    network::features::kTrustTokens.name,
     network_time::kNetworkTimeServiceQuerying.name,
     safe_browsing::kEnhancedProtection.name,
 #if defined(OS_ANDROID)
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index 5bcf7b10954d..9b67e66d5dd9 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -76,6 +76,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
       &features::kSubresourceWebBundles,
       &features::kTabHoverCards,
       &features::kWebOTP,
+      &network::features::kTrustTokens,
       &network_time::kNetworkTimeServiceQuerying,
       &safe_browsing::kEnhancedProtection,
   };
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);
diff --git a/renderer/brave_content_renderer_client.cc b/renderer/brave_content_renderer_client.cc
index 418f8b270107..0468710cc9c9 100644
--- a/renderer/brave_content_renderer_client.cc
+++ b/renderer/brave_content_renderer_client.cc
@@ -26,6 +26,9 @@ SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {
   blink::WebRuntimeFeatures::EnableFeatureFromString(
       "FileSystemAccessAPIExperimental", false);
   blink::WebRuntimeFeatures::EnableFeatureFromString("Serial", false);
+  blink::WebRuntimeFeatures::EnableFeatureFromString("TrustTokens", false);
+  blink::WebRuntimeFeatures::EnableFeatureFromString(
+      "TrustTokensAlwaysAllowIssuance", false);
 }
 
 BraveContentRendererClient::~BraveContentRendererClient() = default;