Reland of Stopped WebVR from being partially enabled during testing.

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 150 matching lines @@
     WebRuntimeFeatures::enablePermissionsAPI(false);
 
   if (command_line.HasSwitch(switches::kDisableV8IdleTasks))
     WebRuntimeFeatures::enableV8IdleTasks(false);
   else
     WebRuntimeFeatures::enableV8IdleTasks(true);
 
   if (command_line.HasSwitch(switches::kEnableUnsafeES3APIs))
     WebRuntimeFeatures::enableUnsafeES3APIs(true);
 
-  if (command_line.HasSwitch(switches::kEnableWebVR)) {
+  if (command_line.HasSwitch(switches::kEnableWebVR))
     WebRuntimeFeatures::enableWebVR(true);
-    WebRuntimeFeatures::enableFeatureFromString(
-        std::string("GeometryInterfaces"), true);
-  }
 
   if (command_line.HasSwitch(switches::kDisablePresentationAPI))
     WebRuntimeFeatures::enablePresentationAPI(false);
 
   const std::string webfonts_intervention_v2_group_name =
       base::FieldTrialList::FindFullName("WebFontsInterventionV2");
   const std::string webfonts_intervention_v2_about_flag =
       command_line.GetSwitchValueASCII(switches::kEnableWebFontsInterventionV2);
   if (!webfonts_intervention_v2_about_flag.empty()) {
     WebRuntimeFeatures::enableWebFontsInterventionV2With2G(
@@ skipping 62 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