Fix AW tests for Spitzer

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

 // Copyright 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.
 
 package org.chromium.android_webview.test;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.KeyEvent;
 import android.view.View;
 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.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.FlakyTest;
 import org.chromium.base.test.util.parameter.ParameterizedTest;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.content_public.browser.WebContents;
 
@@ skipping 183 matching lines @@
 
         // Play and verify that a surface view for hole punching is not created.
         // Note that VIDEO_TEST_URL contains clear video.
         tapPlayButton();
         DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), VIDEO_ID);
         // Wait to ensure that the surface view is not added asynchronously.
         VideoSurfaceViewUtils.waitAndAssertContainsZeroVideoHoleSurfaceViews(this,
                 mTestContainerView);
     }
 
+    /*
     @MediumTest
     @Feature({"AndroidWebView"})
+    crbug.com/597495
+    */
+    @DisabledTest
     public void testOnShowCustomViewTransfersHolePunchingSurfaceForVideoInsideDiv()
             throws Throwable {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mTestContainerView.getAwContents().getSettings().setForceVideoOverlayForTests(true);
             }
         });
 
         loadTestPage(VIDEO_INSIDE_DIV_TEST_URL);
@@ skipping 12 matching lines @@
         // new container view.
         DOMUtils.clickNode(this, mContentViewCore, CUSTOM_FULLSCREEN_CONTROL_ID);
         mContentsClient.waitForCustomViewShown();
         View customView = mContentsClient.getCustomView();
         VideoSurfaceViewUtils.assertContainsZeroVideoHoleSurfaceViews(this, mTestContainerView);
         // Wait to ensure that the surface view stays there after being transfered and not
         // removed asynchronously.
         VideoSurfaceViewUtils.waitAndAssertContainsOneVideoHoleSurfaceView(this, customView);
     }
 
+    /*
     @MediumTest
     @Feature({"AndroidWebView"})
     @FlakyTest
-    public void testOnShowCustomViewRemovesHolePunchingSurfaceForVideo()
-            throws Throwable {
+    crbug.com/597495
+    */
+    @DisabledTest
+    public void testOnShowCustomViewRemovesHolePunchingSurfaceForVideo() throws Throwable {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mTestContainerView.getAwContents().getSettings().setForceVideoOverlayForTests(true);
             }
         });
 
         loadTestPage(VIDEO_TEST_URL);
         assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));
 
@@ skipping 240 matching lines @@
                     return !DOMUtils.isFullscreen(getWebContentsOnUiThread());
                 } catch (InterruptedException | TimeoutException e) {
                     fail(e.getMessage());
                     return false;
                 }
             }
         });
         // TODO: Test that inline video is actually displayed.
     }
 
     private void assertContainsContentVideoView() throws Exception {

[boliu, 2016/06/02 20:28:38]

remove this and assertContainsOneContentVideoView

         VideoSurfaceViewUtils.assertContainsOneContentVideoView(this,
                 mContentsClient.getCustomView());
     }
 
     private JavascriptEventObserver registerObserver(final String observerName) throws Throwable {
         final JavascriptEventObserver observer = new JavascriptEventObserver();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 observer.register(mContentViewCore, observerName);
             }
         });
         return observer;
     }
 
     private void doOnShowAndHideCustomViewTest(String videoTestUrl, final Runnable existFullscreen)
             throws Throwable {
         doOnShowCustomViewTest(videoTestUrl);
         runTestOnUiThread(existFullscreen);
         mContentsClient.waitForCustomViewHidden();
         assertWaitForIsEmbedded();
     }
 
     private void doOnShowCustomViewTest(String videoTestUrl) throws Exception {
         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 {
         loadTestPage(videoTestUrl);
         DOMUtils.clickNode(this, mContentViewCore, CUSTOM_FULLSCREEN_CONTROL_ID);
     }
 
     private void loadTestPage(String videoTestUrl) throws Exception {
         loadUrlSync(mTestContainerView.getAwContents(),
                 mContentsClient.getOnPageFinishedHelper(), videoTestUrl);
         // As we are loading a non-trivial page, let's wait until we have something displayed.
         waitForVisualStateCallback(mTestContainerView.getAwContents());
     }
 
     private WebContents getWebContentsOnUiThread() {
         try {
             return runTestOnUiThreadAndGetResult(new Callable<WebContents>() {
                 @Override
                 public WebContents call() throws Exception {
                     return mContentViewCore.getWebContents();
                 }
             });
         } catch (Exception e) {
             fail(e.getMessage());
             return null;
         }
     }
 }