Move audio focus control from media/ to content/ and make it per WebContents.

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.os.Build;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.KeyEvent;
 import android.view.View;
@@ skipping 172 matching lines @@
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnShowCustomViewAndPlayWithHtmlControl_videoInsideDiv() throws Throwable {
         doTestOnShowCustomViewAndPlayWithHtmlControl(VIDEO_INSIDE_DIV_TEST_URL);
     }
 
     public void doTestOnShowCustomViewAndPlayWithHtmlControl(String videoTestUrl) throws Throwable {
         doOnShowCustomViewTest(videoTestUrl);
-        assertTrue(DOMUtils.isVideoPaused(getWebContentsOnUiThread(), VIDEO_ID));
+        assertTrue(DOMUtils.isMediaPaused(getWebContentsOnUiThread(), VIDEO_ID));
 
         tapPlayButton();
-        assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), VIDEO_ID));
+        assertTrue(DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), VIDEO_ID));
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testHolePunchingSurfaceNotCreatedForClearVideo()
             throws Throwable {
         loadTestPage(VIDEO_TEST_URL);
         assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));
 
         // Play and verify that a surface view for hole punching is not created.
         // Note that VIDEO_TEST_URL contains clear video.
         tapPlayButton();
-        assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), VIDEO_ID));
+        assertTrue(DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), VIDEO_ID));
         // Wait to ensure that the surface view is not added asynchronously.
         VideoSurfaceViewUtils.waitAndAssertContainsZeroVideoHoleSurfaceViews(this,
                 mTestContainerView);
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testOnShowCustomViewTransfersHolePunchingSurfaceForVideoInsideDiv()
             throws Throwable {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mTestContainerView.getAwContents().getSettings().setForceVideoOverlayForTests(true);
             }
         });
 
         loadTestPage(VIDEO_INSIDE_DIV_TEST_URL);
         assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));
 
         // Play and verify that there is a surface view for hole punching.
         tapPlayButton();
-        assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), VIDEO_ID));
+        assertTrue(DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), VIDEO_ID));
         VideoSurfaceViewUtils.pollAndAssertContainsOneVideoHoleSurfaceView(this,
                 mTestContainerView);
 
         // Enter fullscreen and verify that the hole punching surface is transferred. Note
         // that VIDEO_INSIDE_DIV_TEST_URL goes fullscreen on a <div> element, so in fullscreen
         // the video will still be embedded in the page and the hole punching surface required.
         // We need to transfer the external surface so that scrolling is synchronized with the
         // new container view.
         DOMUtils.clickNode(this, mContentViewCore, CUSTOM_FULLSCREEN_CONTROL_ID);
         mContentsClient.waitForCustomViewShown();
@@ skipping 13 matching lines @@
             public void run() {
                 mTestContainerView.getAwContents().getSettings().setForceVideoOverlayForTests(true);
             }
         });
 
         loadTestPage(VIDEO_TEST_URL);
         assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));
 
         // Play and verify that there is a surface view for hole punching.
         tapPlayButton();
-        assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), VIDEO_ID));
+        assertTrue(DOMUtils.waitForMediaPlay(getWebContentsOnUiThread(), VIDEO_ID));
         VideoSurfaceViewUtils.pollAndAssertContainsOneVideoHoleSurfaceView(this,
                 mTestContainerView);
 
         // Enter fullscreen and verify that the surface view is removed. Note that
         // VIDEO_TEST_URL goes fullscreen on the <video> element, so in fullscreen
         // the video will not be embedded in the page and the external surface
         // not longer required.
         DOMUtils.clickNode(this, mContentViewCore, CUSTOM_FULLSCREEN_CONTROL_ID);
         mContentsClient.waitForCustomViewShown();
         View customView = mContentsClient.getCustomView();
@@ skipping 52 matching lines @@
         View customView = mContentsClient.getCustomView();
 
         // No power save blocker is active before playback starts.
         assertKeepScreenOnActive(customView, false);
 
         // Play and verify that there is an active power save blocker.
         tapPlayButton();
         assertWaitForKeepScreenOnActive(customView, true);
 
         // Stop the video and verify that the power save blocker is gone.
-        DOMUtils.pauseVideo(getWebContentsOnUiThread(), VIDEO_ID);
+        DOMUtils.pauseMedia(getWebContentsOnUiThread(), VIDEO_ID);
         assertWaitForKeepScreenOnActive(customView, false);
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testPowerSaveBlockerIsEnabledDuringEmbeddedPlayback()
             throws Throwable {
         assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));
         loadTestPage(VIDEO_INSIDE_DIV_TEST_URL);
 
         // No power save blocker is active before playback starts.
         assertKeepScreenOnActive(mTestContainerView, false);
 
         // Play and verify that there is an active power save blocker.
         tapPlayButton();
         assertWaitForKeepScreenOnActive(mTestContainerView, true);
 
         // Stop the video and verify that the power save blocker is gone.
-        DOMUtils.pauseVideo(getWebContentsOnUiThread(), VIDEO_ID);
+        DOMUtils.pauseMedia(getWebContentsOnUiThread(), VIDEO_ID);
         assertWaitForKeepScreenOnActive(mTestContainerView, false);
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testPowerSaveBlockerIsTransferredToFullscreen()
             throws Throwable {
         assertFalse(DOMUtils.isFullscreen(getWebContentsOnUiThread()));
         loadTestPage(VIDEO_INSIDE_DIV_TEST_URL);
 
         // Play and verify that there is an active power save blocker.
         tapPlayButton();
         assertWaitForKeepScreenOnActive(mTestContainerView, true);
 
         // Enter fullscreen and verify that the power save blocker is
         // still there.
         DOMUtils.clickNode(this, mContentViewCore, CUSTOM_FULLSCREEN_CONTROL_ID);
         mContentsClient.waitForCustomViewShown();
         View customView = mContentsClient.getCustomView();
         assertKeepScreenOnActive(customView, true);
 
         // Pause the video and the power save blocker is gone.
-        DOMUtils.pauseVideo(getWebContentsOnUiThread(), VIDEO_ID);
+        DOMUtils.pauseMedia(getWebContentsOnUiThread(), VIDEO_ID);
         assertWaitForKeepScreenOnActive(customView, false);
 
         // Exit fullscreen and the power save blocker is still gone.
         DOMUtils.exitFullscreen(getWebContentsOnUiThread());
         mContentsClient.waitForCustomViewHidden();
         assertKeepScreenOnActive(mTestContainerView, false);
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
@@ skipping 37 matching lines @@
      */
     private void assertWaitForKeepScreenOnActive(final View view, final boolean expected)
             throws InterruptedException {
         // We need to poll because it takes time to synchronize the state between the android
         // views and Javascript.
         assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 try {
                     return getKeepScreenOn(view) == expected
-                            && DOMUtils.isVideoPaused(getWebContentsOnUiThread(), VIDEO_ID)
+                            && DOMUtils.isMediaPaused(getWebContentsOnUiThread(), VIDEO_ID)
                                 != expected;
                 } catch (InterruptedException | TimeoutException e) {
                     fail(e.getMessage());
                     return false;
                 }
             }
         }));
     }
 
     private void assertKeepScreenOnActive(final View view, final boolean expected)
             throws Exception {
         assertTrue(getKeepScreenOn(view) == expected
-                && DOMUtils.isVideoPaused(getWebContentsOnUiThread(), VIDEO_ID) != expected);
+                && DOMUtils.isMediaPaused(getWebContentsOnUiThread(), VIDEO_ID) != expected);
     }
 
     private boolean getKeepScreenOn(View view) {
         // The power save blocker is added to a child anchor view,
         // so we need to traverse the hierarchy.
         if (view instanceof ViewGroup) {
             ViewGroup viewGroup = (ViewGroup) view;
             for (int i = 0; i < viewGroup.getChildCount(); i++) {
                 if (getKeepScreenOn(viewGroup.getChildAt(i))) {
                     return true;
@@ skipping 88 matching lines @@
                 public WebContents call() throws Exception {
                     return mContentViewCore.getWebContents();
                 }
             });
         } catch (Exception e) {
             fail(e.getMessage());
             return null;
         }
     }
 }