Fix AW tests for Spitzer

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 ad632bfe40bd1eeb3633f85b7f5d4a518e8bcddf..e0ace3bf6b679b6a9466e7fa596076b34e846c23 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
@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import org.chromium.android_webview.test.util.JavascriptEventObserver;
 import org.chromium.android_webview.test.util.VideoSurfaceViewUtils;
 import org.chromium.base.test.util.DisableIf;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.parameter.ParameterizedTest;
 import org.chromium.content.browser.ContentViewCore;
@@ -213,8 +214,12 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
                 mTestContainerView);
     }
 
+    /*
     @MediumTest
     @Feature({"AndroidWebView"})
+    @DisabledTest: crbug.com/597495
+    */
+    @DisabledTest
     public void testOnShowCustomViewTransfersHolePunchingSurfaceForVideoInsideDiv()
             throws Throwable {
         getInstrumentation().runOnMainSync(new Runnable() {
@@ -247,10 +252,13 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
         VideoSurfaceViewUtils.waitAndAssertContainsOneVideoHoleSurfaceView(this, customView);
     }
 
+    /*
     @MediumTest
     @Feature({"AndroidWebView"})
-    public void testOnShowCustomViewRemovesHolePunchingSurfaceForVideo()
-            throws Throwable {
+    @DisabledTest: crbug.com/597495
+    */
+    @DisabledTest
+    public void testOnShowCustomViewRemovesHolePunchingSurfaceForVideo() throws Throwable {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
@@ -539,11 +547,6 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
         loadTestPageAndClickFullscreen(videoTestUrl);
         mContentsClient.waitForCustomViewShown();
         assertWaitForIsFullscreen();
-        if (videoTestUrl.equals(VIDEO_TEST_URL)) {
-            // We only create a ContentVideoView (ie. a hardware accelerated surface) when going
-            // fullscreen on a video element.
-            assertContainsContentVideoView();
-        }
     }
 
     private void loadTestPageAndClickFullscreen(String videoTestUrl) throws Exception {