Convert force video overlay to preference

android_webview/native/aw_settings.cc

Index: android_webview/native/aw_settings.cc
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index 91c506433427b749f3cc2fbe89fa1d0b8d3d338f..fb5488f9bdf445b7d4cfb6bc0813b524dd204a62 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -200,8 +200,13 @@ void AwSettings::UpdateRendererPreferencesLocked(JNIEnv* env, jobject obj) {
 
   bool video_overlay =
       Java_AwSettings_getVideoOverlayForEmbeddedVideoEnabledLocked(env, obj);
-  if (video_overlay != prefs->use_video_overlay_for_embedded_encrypted_video) {
+  bool force_video_overlay =
+      Java_AwSettings_getForceVideoOverlayForTests(env, obj);
+  if (video_overlay !=
+          prefs->use_video_overlay_for_embedded_encrypted_video ||
+      force_video_overlay != prefs->use_view_overlay_for_all_video) {
     prefs->use_video_overlay_for_embedded_encrypted_video = video_overlay;
+    prefs->use_view_overlay_for_all_video = force_video_overlay;
     update_prefs = true;
   }