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

chrome/browser/flag_descriptions.h

Index: chrome/browser/flag_descriptions.h
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index bfcb0d027b7523086bf14d8d235b0298f7d5115c..d8bf85da36a3a2db9731ecea84b0ac31ff903f86 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -713,16 +713,6 @@ 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[];
@@ -3312,6 +3302,22 @@ 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_