Enable ServiceWorkerNavigationPreload by default

content/child/runtime_features.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/runtime_features.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 315 matching lines @@
       base::FeatureList::IsEnabled(features::kAccessibilityObjectModel));
 
 #if defined(OS_ANDROID)
   if (command_line.HasSwitch(switches::kDisableMediaSessionAPI))
     WebRuntimeFeatures::EnableMediaSession(false);
 
   WebRuntimeFeatures::EnablePaymentRequest(
       base::FeatureList::IsEnabled(features::kWebPayments));
 #endif
 
-  // Sets the RuntimeEnabledFeatures for Navigation Preload feature only when
-  // '--enable-features' command line flag is given. While experimenting this
-  // feature using Origin-Trial, this base::Feature is enabled by default in
-  // content_features.cc. So FeatureList::IsEnabled() always returns true. But,
-  // unless the command line explicitly enabled the feature, this feature should
-  // be available only when a valid origin trial token is set. This check is
-  // done by the generated code of
-  // blink::OriginTrials::serviceWorkerNavigationPreloadEnabled(). See the
-  // comments in service_worker_version.h for the details.
-  if (base::FeatureList::GetInstance()->IsFeatureOverriddenFromCommandLine(
-          features::kServiceWorkerNavigationPreload.name,
-          base::FeatureList::OVERRIDE_ENABLE_FEATURE)) {
-    WebRuntimeFeatures::EnableServiceWorkerNavigationPreload(true);
-  }
+  WebRuntimeFeatures::EnableServiceWorkerNavigationPreload(
+      base::FeatureList::IsEnabled(features::kServiceWorkerNavigationPreload));
 
   if (base::FeatureList::IsEnabled(features::kGamepadExtensions))
     WebRuntimeFeatures::EnableGamepadExtensions(true);
 
   if (base::FeatureList::IsEnabled(features::kCompositeOpaqueFixedPosition))
     WebRuntimeFeatures::EnableFeatureFromString("CompositeOpaqueFixedPosition",
                                                 true);
 
   if (!base::FeatureList::IsEnabled(features::kCompositeOpaqueScrollers))
     WebRuntimeFeatures::EnableFeatureFromString("CompositeOpaqueScrollers",
@@ skipping 28 matching lines @@
   if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) {
     std::vector<std::string> disabled_features = base::SplitString(
         command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures),
         ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     for (const std::string& feature : disabled_features)
       WebRuntimeFeatures::EnableFeatureFromString(feature, false);
   }
 }
 
 }  // namespace content