Create autoplay policy flag and merge cross-origin autoplay blocking into it.

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"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "content/common/content_switches_internal.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
+#include "media/base/media_switches.h"
 #include "services/device/public/cpp/device_features.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/native_theme/native_theme_features.h"
 
 using blink::WebRuntimeFeatures;
 
 namespace content {
 
 static void SetRuntimeFeatureDefaultsForPlatform() {
@@ skipping 14 matching lines @@
   WebRuntimeFeatures::EnableNotificationConstructor(false);
   // Android does not yet support switching of audio output devices
   WebRuntimeFeatures::EnableAudioOutputDevices(false);
   WebRuntimeFeatures::EnableAutoplayMutedVideos(true);
   // Android does not yet support SystemMonitor.
   WebRuntimeFeatures::EnableOnDeviceChange(false);
   WebRuntimeFeatures::EnableMediaSession(true);
   WebRuntimeFeatures::EnableMediaControlsOverlayPlayButton(true);
 #else  // defined(OS_ANDROID)
   WebRuntimeFeatures::EnableNavigatorContentUtils(true);
-  if (base::FeatureList::IsEnabled(
-          features::kCrossOriginMediaPlaybackRequiresUserGesture)) {
-    WebRuntimeFeatures::EnableAutoplayMutedVideos(true);
-  }
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID) || defined(USE_AURA)
   WebRuntimeFeatures::EnableCompositedSelectionUpdate(true);
 #endif
 
 #if !(defined OS_ANDROID || defined OS_CHROMEOS)
     // Only Android, ChromeOS support NetInfo right now.
   WebRuntimeFeatures::EnableNetworkInformation(false);
 #endif
@@ skipping 310 matching lines @@
           features::kAllowContentInitiatedDataUrlNavigations));
 
 #if defined(OS_ANDROID)
   if (base::FeatureList::IsEnabled(features::kWebNfc))
     WebRuntimeFeatures::EnableWebNfc(true);
 #endif
 
   if (base::FeatureList::IsEnabled(features::kIdleTimeSpellChecking))
     WebRuntimeFeatures::EnableFeatureFromString("IdleTimeSpellChecking", true);
 
+#if !defined(OS_ANDROID)
+  if (command_line.GetSwitchValueASCII(switches::kAutoplayPolicy) ==
+      switches::autoplay::kCrossOriginUserGestureRequiredPolicy) {
+    WebRuntimeFeatures::EnableAutoplayMutedVideos(true);
+  }
+#endif
+
   // Enable explicitly enabled features, and then disable explicitly disabled
   // ones.
   if (command_line.HasSwitch(switches::kEnableBlinkFeatures)) {
     std::vector<std::string> enabled_features = base::SplitString(
         command_line.GetSwitchValueASCII(switches::kEnableBlinkFeatures),
         ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     for (const std::string& feature : enabled_features)
       WebRuntimeFeatures::EnableFeatureFromString(feature, true);
   }
   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