Convert force video overlay to preference

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java
index 65851a582febf275077242cec82d200193abb206..6168e45abbe7d9f9e08799dd16626e4e0da4fdfa 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java
@@ -216,7 +216,12 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
     @Feature({"AndroidWebView"})
     public void testOnShowCustomViewTransfersHolePunchingSurfaceForVideoInsideDiv()
             throws Throwable {
-        VideoSurfaceViewUtils.forceUseVideoHoleSurfaceView();
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mTestContainerView.getAwContents().getSettings().setForceVideoOverlayForTests(true);
+            }
+        });
 
         loadTestPage(VIDEO_INSIDE_DIV_TEST_URL);
         assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));
@@ -245,7 +250,12 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
     @Feature({"AndroidWebView"})
     public void testOnShowCustomViewRemovesHolePunchingSurfaceForVideo()
             throws Throwable {
-        VideoSurfaceViewUtils.forceUseVideoHoleSurfaceView();
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mTestContainerView.getAwContents().getSettings().setForceVideoOverlayForTests(true);
+            }
+        });
 
         loadTestPage(VIDEO_TEST_URL);
         assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));