Remove AutoplayPolicy enum in blink::WebSettings

As content::WebPreferences was moved to Blink, we don't
need to keep AutoplayPolicy enum in WebSettings because
we can use it from WebPreferences directly.

Bug: 919392, 1097943
Change-Id: Ied0db3fa771416fcc5ce35f5c0a14889dcfa0866
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2409690Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#807314}

content/renderer/render_view_impl.cc

@@ -798,22 +798,7 @@ void RenderView::ApplyWebPreferences(
   settings->SetForceDarkModeEnabled(prefs.force_dark_mode_enabled);
 
   settings->SetAccessibilityAlwaysShowFocus(prefs.always_show_focus);
-
-  switch (prefs.autoplay_policy) {
-    case blink::web_pref::AutoplayPolicy::kNoUserGestureRequired:
-      settings->SetAutoplayPolicy(
-          WebSettings::AutoplayPolicy::kNoUserGestureRequired);
-      break;
-    case blink::web_pref::AutoplayPolicy::kUserGestureRequired:
-      settings->SetAutoplayPolicy(
-          WebSettings::AutoplayPolicy::kUserGestureRequired);
-      break;
-    case blink::web_pref::AutoplayPolicy::kDocumentUserActivationRequired:
-      settings->SetAutoplayPolicy(
-          WebSettings::AutoplayPolicy::kDocumentUserActivationRequired);
-      break;
-  }
-
+  settings->SetAutoplayPolicy(prefs.autoplay_policy);
   settings->SetViewportEnabled(prefs.viewport_enabled);
   settings->SetViewportMetaEnabled(prefs.viewport_meta_enabled);
   settings->SetViewportStyle(

third_party/blink/public/web/web_settings.h

@@ -35,6 +35,7 @@
 
 #include "third_party/blink/public/common/css/navigation_controls.h"
 #include "third_party/blink/public/common/css/preferred_color_scheme.h"
+#include "third_party/blink/public/common/web_preferences/web_preferences.h"
 #include "third_party/blink/public/platform/pointer_properties.h"
 #include "third_party/blink/public/platform/web_common.h"
 #include "third_party/blink/public/platform/web_effective_connection_type.h"
@@ -95,14 +96,6 @@ class WebSettings {
     kForceAllTrue  // Force all values to be true even when specified.
   };
 
-  // Defines the autoplay policy to be used. Should match the enum class in
-  // web_preferences.h
-  enum class AutoplayPolicy {
-    kNoUserGestureRequired = 0,
-    kUserGestureRequired,
-    kDocumentUserActivationRequired,
-  };
-
   // Sets value of a setting by its string identifier from Settings.in and
   // string representation of value. An enum's string representation is the
   // string representation of the integer value of the enum.
@@ -133,7 +126,7 @@ class WebSettings {
   virtual void SetAlwaysShowContextMenuOnTouch(bool) = 0;
   virtual void SetAntialiased2dCanvasEnabled(bool) = 0;
   virtual void SetAntialiasedClips2dCanvasEnabled(bool) = 0;
-  virtual void SetAutoplayPolicy(AutoplayPolicy) = 0;
+  virtual void SetAutoplayPolicy(web_pref::AutoplayPolicy) = 0;
   virtual void SetAutoZoomFocusedNodeToLegibleScale(bool) = 0;
   virtual void SetCaretBrowsingEnabled(bool) = 0;
   virtual void SetClobberUserAgentInitialScaleQuirk(bool) = 0;

third_party/blink/renderer/core/exported/web_settings_impl.cc

@@ -133,7 +133,7 @@ void WebSettingsImpl::SetMinimumLogicalFontSize(int size) {
   settings_->SetMinimumLogicalFontSize(size);
 }
 
-void WebSettingsImpl::SetAutoplayPolicy(AutoplayPolicy policy) {
+void WebSettingsImpl::SetAutoplayPolicy(web_pref::AutoplayPolicy policy) {
   settings_->SetAutoplayPolicy(
       static_cast<blink::AutoplayPolicy::Type>(policy));
 }

third_party/blink/renderer/core/exported/web_settings_impl.h

@@ -50,7 +50,7 @@ class CORE_EXPORT WebSettingsImpl final : public WebSettings {
   bool ShrinksViewportContentToFit() const override;
   bool ViewportEnabled() const override;
   void SetAccelerated2dCanvasMSAASampleCount(int) override;
-  void SetAutoplayPolicy(AutoplayPolicy) override;
+  void SetAutoplayPolicy(web_pref::AutoplayPolicy) override;
   void SetPreferCompositingToLCDTextEnabled(bool) override;
   void SetAccessibilityPasswordValuesEnabled(bool) override;
   void SetAllowFileAccessFromFileURLs(bool) override;

third_party/blink/renderer/core/html/media/autoplay_policy.cc

@@ -395,11 +395,11 @@ void AutoplayPolicy::Trace(Visitor* visitor) const {
   visitor->Trace(autoplay_uma_helper_);
 }
 
-STATIC_ASSERT_ENUM(WebSettings::AutoplayPolicy::kNoUserGestureRequired,
+STATIC_ASSERT_ENUM(web_pref::AutoplayPolicy::kNoUserGestureRequired,
                    AutoplayPolicy::Type::kNoUserGestureRequired);
-STATIC_ASSERT_ENUM(WebSettings::AutoplayPolicy::kUserGestureRequired,
+STATIC_ASSERT_ENUM(web_pref::AutoplayPolicy::kUserGestureRequired,
                    AutoplayPolicy::Type::kUserGestureRequired);
-STATIC_ASSERT_ENUM(WebSettings::AutoplayPolicy::kDocumentUserActivationRequired,
+STATIC_ASSERT_ENUM(web_pref::AutoplayPolicy::kDocumentUserActivationRequired,
                    AutoplayPolicy::Type::kDocumentUserActivationRequired);
 
 }  // namespace blink

third_party/blink/renderer/core/html/media/video_auto_fullscreen_test.cc

@@ -71,7 +71,7 @@ class VideoAutoFullscreen : public testing::Test,
     frame_host_.Init(
         web_frame_client_.GetRemoteNavigationAssociatedInterfaces());
     GetWebView()->GetSettings()->SetAutoplayPolicy(
-        WebSettings::AutoplayPolicy::kUserGestureRequired);
+        web_pref::AutoplayPolicy::kUserGestureRequired);
 
     frame_test_helpers::LoadFrame(
         web_view_helper_.GetWebView()->MainFrameImpl(), "about:blank");