Make autoplay policies no longer platform dependant.

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 353 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) {
+  if (media::GetEffectiveAutoplayPolicy(command_line) !=
+      switches::autoplay::kNoUserGestureRequiredPolicy) {
     WebRuntimeFeatures::EnableAutoplayMutedVideos(true);
   }
-#endif
 
   WebRuntimeFeatures::EnableLocationHardReload(
       base::FeatureList::IsEnabled(features::kLocationHardReload));
 
   // 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