Remove video overlay support from WebView

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java
index 93b1c418a184afefb8908318527a6666ba12ecab..89d381255c3fca3d3eaa49f1de4000e99680dea1 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/MultipleVideosTest.java
@@ -4,8 +4,6 @@
 
 package org.chromium.android_webview.test;
 
-import org.chromium.android_webview.test.util.VideoSurfaceViewUtils;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content_public.browser.WebContents;
@@ -36,43 +34,6 @@ public class MultipleVideosTest extends AwTestBase {
         enableJavaScriptOnUiThread(mTestContainerView.getAwContents());
     }
 
-    /*
-    @MediumTest
-    @Feature({"AndroidWebView"})
-    */
-    @DisabledTest(message = "crbug.com/597495")
-    public void testFirstVideoPausesWhenSecondVideoStarts() throws Throwable {
-        // To test video hole surfaces we must force video overlay before loading page.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mTestContainerView.getAwContents().getSettings().setForceVideoOverlayForTests(true);
-            }
-        });
-
-        loadTestPage();
-
-        // Play the first video.
-        tapFirstPlayButton();
-        DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), FIRST_VIDEO_ID);
-
-        // Verify that there is one video hole surface.
-        VideoSurfaceViewUtils.pollAndAssertContainsOneVideoHoleSurfaceView(this,
-                mTestContainerView);
-
-        // Start the second video.
-        tapSecondPlayButton();
-        DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), SECOND_VIDEO_ID);
-
-        // Verify that the first video pauses once the second video starts.
-        assertFalse(DOMUtils.isMediaPaused(getWebContentsOnUiThread(), SECOND_VIDEO_ID));
-        assertTrue(DOMUtils.isMediaPaused(getWebContentsOnUiThread(), FIRST_VIDEO_ID));
-
-        // Verify that there is still only one video hole surface.
-        VideoSurfaceViewUtils.pollAndAssertContainsOneVideoHoleSurfaceView(this,
-                mTestContainerView);
-    }
-
     private void loadTestPage() throws Exception {
         loadUrlSync(mTestContainerView.getAwContents(),
                 mContentsClient.getOnPageFinishedHelper(), MULTIPLE_VIDEOS_TEST_URL);