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

chrome/browser/about_flags.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 "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 688 matching lines @@
     {flag_descriptions::kEnableDefaultMediaSessionEnabled,
      switches::kEnableDefaultMediaSession, ""},
 #if BUILDFLAG(ENABLE_PLUGINS)
     {flag_descriptions::kEnableDefaultMediaSessionEnabledDuckFlash,
      switches::kEnableDefaultMediaSession,
      switches::kEnableDefaultMediaSessionDuckFlash},
 #endif  // BUILDFLAG(ENABLE_PLUGINS)
 };
 #endif  // !defined(OS_ANDROID)
 
+const FeatureEntry::Choice kAutoplayPolicyChoices[] = {
+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
+    {flag_descriptions::kAutoplayPolicyNoUserGestureRequired,
+     switches::kAutoplayPolicy,
+     switches::autoplay::kNoUserGestureRequiredPolicy},
+#if defined(OS_ANDROID)
+    {flag_descriptions::kAutoplayPolicyUserGestureRequired,
+     switches::kAutoplayPolicy, switches::autoplay::kUserGestureRequiredPolicy},
+#else
+    {flag_descriptions::kAutoplayPolicyCrossOriginUserGestureRequired,
+     switches::kAutoplayPolicy,
+     switches::autoplay::kCrossOriginUserGestureRequiredPolicy},
+#endif
+};
+
 const FeatureEntry::FeatureParam kNoStatePrefetchEnabled[] = {
     {prerender::kNoStatePrefetchFeatureModeParameterName,
      prerender::kNoStatePrefetchFeatureModeParameterPrefetch}};
 
 const FeatureEntry::FeatureParam kNoStatePrefetchPrerender[] = {
     {prerender::kNoStatePrefetchFeatureModeParameterName,
      prerender::kNoStatePrefetchFeatureModeParameterPrerender}};
 
 const FeatureEntry::FeatureParam kNoStatePrefetchSimpleLoad[] = {
     {prerender::kNoStatePrefetchFeatureModeParameterName,
@@ skipping 707 matching lines @@
      flag_descriptions::kDefaultTileWidthDescription, kOsAll,
      MULTI_VALUE_TYPE(kDefaultTileWidthChoices)},
     {"default-tile-height", flag_descriptions::kDefaultTileHeightName,
      flag_descriptions::kDefaultTileHeightDescription, kOsAll,
      MULTI_VALUE_TYPE(kDefaultTileHeightChoices)},
     {"disable-gesture-requirement-for-media-playback",
      flag_descriptions::kGestureRequirementForMediaPlaybackName,
      flag_descriptions::kGestureRequirementForMediaPlaybackDescription, kOsAll,
      SINGLE_DISABLE_VALUE_TYPE(
          switches::kDisableGestureRequirementForMediaPlayback)},
-#if !defined(OS_ANDROID)
-    {"cross-origin-media-playback-requires-user-gesture",
-     flag_descriptions::kCrossOriginMediaPlaybackRequiresUserGestureName,
-     flag_descriptions::kCrossOriginMediaPlaybackRequiresUserGestureDescription,
-     kOsDesktop,
-     FEATURE_VALUE_TYPE(
-         features::kCrossOriginMediaPlaybackRequiresUserGesture)},
-#endif  // !defined(OS_ANDROID)
-
 #if defined(OS_CHROMEOS)
     {"enable-virtual-keyboard", flag_descriptions::kVirtualKeyboardName,
      flag_descriptions::kVirtualKeyboardDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)},
     {"virtual-keyboard-overscroll",
      flag_descriptions::kVirtualKeyboardOverscrollName,
      flag_descriptions::kVirtualKeyboardOverscrollDescription, kOsCrOS,
      SINGLE_DISABLE_VALUE_TYPE(
          keyboard::switches::kDisableVirtualKeyboardOverscroll)},
     {"input-view", flag_descriptions::kInputViewName,
@@ skipping 1297 matching lines @@
      flag_descriptions::kEnableIdleTimeSpellCheckingDescription, kOsAll,
      FEATURE_VALUE_TYPE(features::kIdleTimeSpellChecking)},
 
 #if defined(OS_ANDROID)
     {"enable-clipboard-provider",
      flag_descriptions::kEnableOmniboxClipboardProviderName,
      flag_descriptions::kEnableOmniboxClipboardProviderDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(omnibox::kEnableClipboardProvider)},
 #endif
 
+    {"autoplay-policy", flag_descriptions::kAutoplayPolicyName,
+     flag_descriptions::kAutoplayPolicyDescription, kOsAll,
+     MULTI_VALUE_TYPE(kAutoplayPolicyChoices)},
+
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
 };
 
 class FlagsStateSingleton {
  public:
   FlagsStateSingleton()
       : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
   ~FlagsStateSingleton() {}
@@ skipping 196 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags