Migrate AudioFocusChangeListener to browser and always send GAIN

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 6168e45abbe7d9f9e08799dd16626e4e0da4fdfa..00d53cbace12e2ab4eb925bd1d2ee217a569e2d5 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
@@ -193,7 +193,9 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
         assertTrue(DOMUtils.isVideoPaused(getWebContentsOnUiThread(), VIDEO_ID));
 
         tapPlayButton();
-        assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), VIDEO_ID));
+        assertTrue(DOMUtils.waitForVideoState(getWebContentsOnUiThread(),
+                                              VIDEO_ID,
+                                              DOMUtils.VIDEO_STATE_PLAYING));
     }
 
     @MediumTest
@@ -206,7 +208,9 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
         // 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.waitForVideoState(getWebContentsOnUiThread(),
+                                              VIDEO_ID,
+                                              DOMUtils.VIDEO_STATE_PLAYING));
         // Wait to ensure that the surface view is not added asynchronously.
         VideoSurfaceViewUtils.waitAndAssertContainsZeroVideoHoleSurfaceViews(this,
                 mTestContainerView);
@@ -228,7 +232,9 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
 
         // Play and verify that there is a surface view for hole punching.
         tapPlayButton();
-        assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), VIDEO_ID));
+        assertTrue(DOMUtils.waitForVideoState(getWebContentsOnUiThread(),
+                                              VIDEO_ID,
+                                              DOMUtils.VIDEO_STATE_PLAYING));
         VideoSurfaceViewUtils.pollAndAssertContainsOneVideoHoleSurfaceView(this,
                 mTestContainerView);
 
@@ -262,7 +268,9 @@ public class AwContentsClientFullScreenTest extends AwTestBase {
 
         // Play and verify that there is a surface view for hole punching.
         tapPlayButton();
-        assertTrue(DOMUtils.waitForVideoPlay(getWebContentsOnUiThread(), VIDEO_ID));
+        assertTrue(DOMUtils.waitForVideoState(getWebContentsOnUiThread(),
+                                              VIDEO_ID,
+                                              DOMUtils.VIDEO_STATE_PLAYING));
         VideoSurfaceViewUtils.pollAndAssertContainsOneVideoHoleSurfaceView(this,
                 mTestContainerView);