Convert force video overlay to preference

android_webview/native/aw_settings.cc

 // Copyright (c) 2013 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 "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_content_client.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
@@ skipping 182 matching lines @@
   RendererPreferences* prefs = web_contents()->GetMutableRendererPrefs();
 
   if (!renderer_prefs_initialized_) {
     PopulateFixedRendererPreferences(prefs);
     renderer_prefs_initialized_ = true;
     update_prefs = true;
   }
 
   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;
   }
 
   content::RenderViewHost* host = web_contents()->GetRenderViewHost();
   if (update_prefs && host)
     host->SyncRendererPrefs();
 }
 
 void AwSettings::UpdateOffscreenPreRasterLocked(JNIEnv* env, jobject obj) {
   AwContents* contents = AwContents::FromWebContents(web_contents());
@@ skipping 211 matching lines @@
 
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release();
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview