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

content/browser/renderer_host/render_view_host_impl.cc

 // Copyright (c) 2012 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/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 421 matching lines @@
 
   prefs.use_solid_color_scrollbars = false;
 
   prefs.history_entry_requires_user_gesture =
       command_line.HasSwitch(switches::kHistoryEntryRequiresUserGesture);
 
 #if defined(OS_ANDROID)
   // On Android, user gestures are normally required, unless that requirement
   // is disabled with a command-line switch or the equivalent field trial is
   // is set to "Enabled".
-  prefs.user_gesture_required_for_media_playback = !command_line.HasSwitch(
-      switches::kDisableGestureRequirementForMediaPlayback);
+  prefs.user_gesture_required_for_media_playback =
+      !command_line.HasSwitch(
+          switches::kDisableGestureRequirementForMediaPlayback) ||
+      command_line.GetSwitchValueASCII(switches::kAutoplayPolicy) ==

[whywhat, 2017/04/24 18:06:24]

shouldn't this be != ?
or rather == kAutoplayPolicyGestureRequired?

[mlamouri (slow - plz ping), 2017/04/24 18:41:23]

Oups, yes :)

+          switches::autoplay::kNoRestrictionPolicy;
 
   prefs.progress_bar_completion = GetProgressBarCompletionPolicy();
 
   prefs.use_solid_color_scrollbars = true;
 #else  // defined(OS_ANDROID)
   prefs.cross_origin_media_playback_requires_user_gesture =
-      base::FeatureList::GetInstance()->IsEnabled(
-          features::kCrossOriginMediaPlaybackRequiresUserGesture);
+      command_line.GetSwitchValueASCII(switches::kAutoplayPolicy) ==
+      switches::autoplay::kCrossOriginUserGestureRequiredPolicy;
 #endif  // defined(OS_ANDROID)
 
   const std::string touch_enabled_switch =
       command_line.HasSwitch(switches::kTouchEventFeatureDetection)
           ? command_line.GetSwitchValueASCII(
                 switches::kTouchEventFeatureDetection)
           : switches::kTouchEventFeatureDetectionAuto;
   prefs.touch_event_feature_detection_enabled =
       (touch_enabled_switch == switches::kTouchEventFeatureDetectionAuto)
           ? (ui::GetTouchScreensAvailability() ==
@@ skipping 491 matching lines @@
 }
 
 void RenderViewHostImpl::ClosePageTimeout() {
   if (delegate_->ShouldIgnoreUnresponsiveRenderer())
     return;
 
   ClosePageIgnoringUnloadEvents();
 }
 
 }  // namespace content