Merge pull request #19476 from brave/maxk-disable-WebEnvironmentInteg…

…rity Disables WebEnvironmentIntegrity feature and origin trials.
brave · Jul 31, 2023 · 59f4519 · 59f4519
2 parents 8cbc7e2 + 4f9f7e3
commit 59f4519
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
@@ -198,6 +198,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
 #if BUILDFLAG(IS_MAC)
     &features::kUseChromiumUpdater,
 #endif
+    &features::kWebEnvironmentIntegrity,
     &features::kWebOTP,
     &history::kOrganicRepeatableQueries,
     &history::kSyncSegmentsData,

diff --git a/chromium_src/content/public/common/content_features.cc b/chromium_src/content/public/common/content_features.cc
@@ -23,6 +23,7 @@ OVERRIDE_FEATURE_DEFAULT_STATES({{
     {kSignedExchangeReportingForDistributors,
      base::FEATURE_DISABLED_BY_DEFAULT},
     {kSignedHTTPExchange, base::FEATURE_DISABLED_BY_DEFAULT},
+    {kWebEnvironmentIntegrity, base::FEATURE_DISABLED_BY_DEFAULT},
 #if BUILDFLAG(IS_ANDROID)
     {kWebNfc, base::FEATURE_DISABLED_BY_DEFAULT},
 #endif

diff --git a/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc b/chromium_src/third_party/blink/common/origin_trials/origin_trials.cc
@@ -35,6 +35,7 @@ bool IsTrialDisabledInBrave(base::StringPiece trial_name) {
       "SignedExchangeSubresourcePrefetch",
       "SubresourceWebBundles",
       "TrustTokens",
+      "WebEnvironmentIntegrity",
   };
   // clang-format on
 
@@ -61,6 +62,7 @@ bool IsTrialDisabledInBrave(OriginTrialFeature feature) {
           OriginTrialFeature::kParakeet,
           OriginTrialFeature::kPrivacySandboxAdsAPIs,
           OriginTrialFeature::kPrivateStateTokens,
+          OriginTrialFeature::kWebEnvironmentIntegrity,
       };
   // clang-format on
 

diff --git a/renderer/brave_content_renderer_client.cc b/renderer/brave_content_renderer_client.cc
@@ -69,6 +69,8 @@ void BraveContentRendererClient::
   blink::WebRuntimeFeatures::EnableFeatureFromString(
       "SpeculationRulesPrefetchProxy", false);
   blink::WebRuntimeFeatures::EnableFeatureFromString("AdTagging", false);
+  blink::WebRuntimeFeatures::EnableFeatureFromString("WebEnvironmentIntegrity",
+                                                     false);
 }
 
 BraveContentRendererClient::~BraveContentRendererClient() = default;