Introduce Origin-Trial for Service Worker Navigation Preload

content/child/runtime_features.cc

Index: content/child/runtime_features.cc
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
index 9ebda8a1510057cc5a987ba87f8391b812573113..b5f6c6206e82b3806ed82fc1f6407730125db864 100644
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -314,8 +314,11 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
       base::FeatureList::IsEnabled(features::kWebPayments));
 #endif
 
-  if (base::FeatureList::IsEnabled(features::kServiceWorkerNavigationPreload))
+  if (base::FeatureList::GetInstance()->IsFeatureOverriddenFromCommandLine(

[falken, 2017/01/13 03:43:41]

Let's add a comment about why this is using IsFeatureOverriddenFromCommand,
which is different from the rest of the code in this file.

[horo, 2017/01/13 08:41:32]

Done.

+          features::kServiceWorkerNavigationPreload.name,
+          base::FeatureList::OVERRIDE_ENABLE_FEATURE)) {
     WebRuntimeFeatures::enableServiceWorkerNavigationPreload(true);
+  }
 
   if (base::FeatureList::IsEnabled(features::kSpeculativeLaunchServiceWorker))
     WebRuntimeFeatures::enableSpeculativeLaunchServiceWorker(true);