Remove flags & switches for disabling origin trial framework

Bug: 951807
Change-Id: Iea14dadc17791f222fb3206eff67d9293e4285e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1764318Reviewed-by: Jason Chase <chasej@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Rodney Ding <rodneyding@google.com>
Cr-Commit-Position: refs/heads/master@{#690075}

chrome/common/origin_trials/chrome_origin_trial_policy.cc

@@ -53,7 +53,7 @@ ChromeOriginTrialPolicy::ChromeOriginTrialPolicy()
 ChromeOriginTrialPolicy::~ChromeOriginTrialPolicy() {}
 
 bool ChromeOriginTrialPolicy::IsOriginTrialsSupported() const {
-  return base::FeatureList::IsEnabled(features::kOriginTrials);
+  return true;
 }
 
 base::StringPiece ChromeOriginTrialPolicy::GetPublicKey() const {

content/child/runtime_features.cc

@@ -58,8 +58,6 @@ void SetRuntimeFeatureDefaultsForPlatform() {
 void SetIndividualRuntimeFeatures(
     const base::CommandLine& command_line,
     bool enable_experimental_web_platform_features) {
-  WebRuntimeFeatures::EnableOriginTrials(
-      base::FeatureList::IsEnabled(features::kOriginTrials));
 
   if (!base::FeatureList::IsEnabled(features::kWebUsb))
     WebRuntimeFeatures::EnableWebUsb(false);

content/public/common/content_features.cc

@@ -306,10 +306,6 @@ const base::Feature kNotificationTriggers{"NotificationTriggers",
 const base::Feature kOriginPolicy{"OriginPolicy",
                                   base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Origin Trials for controlling access to feature/API experiments.
-const base::Feature kOriginTrials{"OriginTrials",
-                                  base::FEATURE_ENABLED_BY_DEFAULT};
-
 // History navigation in response to horizontal overscroll (aka gesture-nav).
 const base::Feature kOverscrollHistoryNavigation {
   "OverscrollHistoryNavigation",

content/public/common/content_features.h

@@ -73,7 +73,6 @@ CONTENT_EXPORT extern const base::Feature kNetworkServiceInProcess;
 CONTENT_EXPORT extern const base::Feature kNotificationContentImage;
 CONTENT_EXPORT extern const base::Feature kNotificationTriggers;
 CONTENT_EXPORT extern const base::Feature kOriginPolicy;
-CONTENT_EXPORT extern const base::Feature kOriginTrials;
 CONTENT_EXPORT extern const base::Feature kOverscrollHistoryNavigation;
 CONTENT_EXPORT extern const base::Feature kPassiveDocumentEventListeners;
 CONTENT_EXPORT extern const base::Feature kPassiveDocumentWheelEventListeners;

content/shell/common/shell_origin_trial_policy.cc

@@ -33,7 +33,7 @@ ShellOriginTrialPolicy::ShellOriginTrialPolicy()
 ShellOriginTrialPolicy::~ShellOriginTrialPolicy() {}
 
 bool ShellOriginTrialPolicy::IsOriginTrialsSupported() const {
-  return base::FeatureList::IsEnabled(features::kOriginTrials);
+  return true;
 }
 
 base::StringPiece ShellOriginTrialPolicy::GetPublicKey() const {

third_party/blink/public/platform/web_runtime_features.h

@@ -70,9 +70,6 @@ class WebRuntimeFeatures {
 
   BLINK_PLATFORM_EXPORT static void EnableCompositorTouchAction(bool);
 
-  BLINK_PLATFORM_EXPORT static void EnableOriginTrials(bool);
-  BLINK_PLATFORM_EXPORT static bool IsOriginTrialsEnabled();
-
   BLINK_PLATFORM_EXPORT static void EnableAccelerated2dCanvas(bool);
   BLINK_PLATFORM_EXPORT static void EnableAccessibilityObjectModel(bool);
   BLINK_PLATFORM_EXPORT static void EnableAdTagging(bool);

third_party/blink/renderer/core/origin_trials/origin_trial_context.cc

@@ -272,8 +272,6 @@ void OriginTrialContext::AddFeature(OriginTrialFeature feature) {
 }
 
 bool OriginTrialContext::IsFeatureEnabled(OriginTrialFeature feature) const {
-  if (!RuntimeEnabledFeatures::OriginTrialsEnabled())
-    return false;
 
   if (enabled_features_.Contains(feature) ||
       navigation_activated_features_.Contains(feature)) {
@@ -299,9 +297,6 @@ bool OriginTrialContext::IsFeatureEnabled(OriginTrialFeature feature) const {
 
 bool OriginTrialContext::IsNavigationFeatureActivated(
     OriginTrialFeature feature) const {
-  if (!RuntimeEnabledFeatures::OriginTrialsEnabled())
-    return false;
-
   return navigation_activated_features_.Contains(feature);
 }
 

third_party/blink/renderer/core/origin_trials/origin_trial_context_test.cc

@@ -71,12 +71,10 @@ class MockTokenValidator : public TrialTokenValidator {
 
 }  // namespace
 
-class OriginTrialContextTest : public testing::Test,
-                               private ScopedOriginTrialsForTest {
+class OriginTrialContextTest : public testing::Test{
  protected:
   OriginTrialContextTest()
-      : ScopedOriginTrialsForTest(true),
-        token_validator_(new MockTokenValidator),
+      : token_validator_(new MockTokenValidator),
         execution_context_(MakeGarbageCollected<NullExecutionContext>(
             MakeGarbageCollected<OriginTrialContext>(
                 std::unique_ptr<MockTokenValidator>(token_validator_)))),

third_party/blink/renderer/platform/exported/web_runtime_features.cc

@@ -296,14 +296,6 @@ void WebRuntimeFeatures::EnableOrientationEvent(bool enable) {
   RuntimeEnabledFeatures::SetOrientationEventEnabled(enable);
 }
 
-void WebRuntimeFeatures::EnableOriginTrials(bool enable) {
-  RuntimeEnabledFeatures::SetOriginTrialsEnabled(enable);
-}
-
-bool WebRuntimeFeatures::IsOriginTrialsEnabled() {
-  return RuntimeEnabledFeatures::OriginTrialsEnabled();
-}
-
 void WebRuntimeFeatures::EnableOverflowIconsForMediaControls(bool enable) {
   RuntimeEnabledFeatures::SetOverflowIconsForMediaControlsEnabled(enable);
 }

third_party/blink/renderer/platform/runtime_enabled_features.json5

@@ -1096,10 +1096,7 @@
       name: "OrientationEvent",
       status: {"Android": "stable"},
     },
-    {
-      name: "OriginTrials",
-      status: "stable",
-    },
+
     // Define a sample API for testing integration with the Origin Trials
     // Framework. The sample API is used in both unit and web tests for the
     // Origin Trials Framework. Do not change this flag to stable, as it exists