Fix AW tests for Spitzer

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
index cadac0ef55168891212a9cb9d7cbd6c63133884a..b99b01521eb05094964b45695dbf5b92c9c33c7d 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ExternalVideoSurfaceContainerTest.java
@@ -5,10 +5,9 @@
 package org.chromium.android_webview.test;
 
 import android.graphics.RectF;
-import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.android_webview.test.util.VideoTestUtil;
-import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.DisabledTest;
 import org.chromium.components.external_video_surface.ExternalVideoSurfaceContainer;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.CallbackHelper;
@@ -96,9 +95,12 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {
         });
     }
 
+    /*
     @DisableHardwareAccelerationForTest
     @SmallTest
     @Feature({"AndroidWebView"})
+    */
+    @DisabledTest(message = "crbug.com/597495")
     public void testEnableVideoOverlayForEmbeddedVideo() throws Throwable {
         setUpMockExternalVideoSurfaceContainer();
 
@@ -112,9 +114,12 @@ public class ExternalVideoSurfaceContainerTest extends AwTestBase {
                                  onPositionChangedCallCount, 150.0f, 150.0f);
     }
 
+    /*
     @DisableHardwareAccelerationForTest
     @SmallTest
     @Feature({"AndroidWebView"})
+    */
+    @DisabledTest(message = "crbug.com/597495")
     public void testDisableVideoOverlayForEmbeddedVideo() throws Throwable {
         setUpMockExternalVideoSurfaceContainer();