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

chrome/browser/flag_descriptions.h

 // Copyright 2017 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.
 
 #ifndef CHROME_BROWSER_FLAG_DESCRIPTIONS_H_
 #define CHROME_BROWSER_FLAG_DESCRIPTIONS_H_
 
 // Includes needed for macros allowing conditional compilation of some strings.
 #include "build/build_config.h"
 #include "build/buildflag.h"
@@ skipping 695 matching lines @@
 // Description for the flag to enable Token Binding. Please do not translate
 // 'Token Binding'.
 extern const char kEnableTokenBindingDescription[];
 
 // Title for the flag for gesture requiment for media playback
 extern const char kGestureRequirementForMediaPlaybackName[];
 
 // Description for the flag for gesture requiment for media playback
 extern const char kGestureRequirementForMediaPlaybackDescription[];
 
-#if !defined(OS_ANDROID)
-
-// Title for the flag for gesture requiment for media playback
-extern const char kCrossOriginMediaPlaybackRequiresUserGestureName[];
-
-// Description for the flag for gesture requiment for media playback
-extern const char kCrossOriginMediaPlaybackRequiresUserGestureDescription[];
-
-#endif  // !defined(OS_ANDROID)
-
 // Description for the flag to adjust the default behaviour for document level
 // passive touch listeners.
 extern const char kPassiveDocumentEventListenersDescription[];
 
 // Name for the flag to adjust the default behaviour for document level passive
 // listeners.
 extern const char kPassiveDocumentEventListenersName[];
 
 // Description for the flag to adjust the default behaviour for passive touch
 // listeners during fling.
@@ skipping 2569 matching lines @@
 #if defined(OS_ANDROID)
 
 // Name of the flag that enables the omnibox's clipboard URL provider.
 extern const char kEnableOmniboxClipboardProviderName[];
 
 // Description of the flag that enables the omnibox's clipboard URL provider.
 extern const char kEnableOmniboxClipboardProviderDescription[];
 
 #endif  // defined(OS_ANDROID)
 
+// Name of the autoplay policy flag.
+extern const char kAutoplayPolicyName[];
+
+// Description of the autoplay policy entry.
+extern const char kAutoplayPolicyDescription[];
+
+// Description of the autoplay policy that requires a user gesture on cross
+// origin iframes.
+extern const char kAutoplayPolicyCrossOriginUserGestureRequired[];
+
+// Description of the autoplay policy that has no user gesture requirements.
+extern const char kAutoplayPolicyNoUserGestureRequired[];
+
+// Description of the autoplay policy that requires a user gesture.
+extern const char kAutoplayPolicyUserGestureRequired[];
+
 }  // namespace flag_descriptions
 
 #endif  // CHROME_BROWSER_FLAG_DESCRIPTIONS_H_