Distingush between displayed and remote playback state.

chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java
index 3c83d84f6158239a9c4c5279858be6c32cf6d594..70790f2ca506a7da6089c40abf78a6fc008be1b9 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java
@@ -131,6 +131,8 @@ public class AbstractMediaRouteControllerTest {
         // Default
         assertFalse(mediaRouteCtrl.isBeingCast());
 
+        mediaRouteCtrl.setPreparedForTesting();
+
         mediaRouteCtrl.setPlayerStateForMediaItemState(MediaItemStatus.PLAYBACK_STATE_BUFFERING);
         assertTrue(mediaRouteCtrl.isBeingCast());
 
@@ -161,6 +163,9 @@ public class AbstractMediaRouteControllerTest {
 
         mediaRouteCtrl.setPlayerStateForMediaItemState(MediaItemStatus.PLAYBACK_STATE_PLAYING);
         assertTrue(mediaRouteCtrl.isBeingCast());
+
+        mediaRouteCtrl.setUnprepared();
+        assertFalse(mediaRouteCtrl.isBeingCast());
     }
 
     /** Test method for {@link AbstractMediaRouteController#isRemotePlaybackAvailable()}.*/
@@ -294,39 +299,6 @@ public class AbstractMediaRouteControllerTest {
     }
 
     /**
-     * Test method for {@link AbstractMediaRouteController#shouldResetState(MediaStateListener)}.
-     */
-    @Test
-    @Feature({"MediaRemote"})
-    public void testShouldResetState() {
-        AbstractMediaRouteController mediaRouteCtrl = new DummyMediaRouteController();
-        MediaStateListener listener = mock(MediaStateListener.class);
-
-        mediaRouteCtrl.setMediaStateListener(null);
-
-        assertTrue(mediaRouteCtrl.shouldResetState(null));
-        assertTrue(mediaRouteCtrl.shouldResetState(mock(MediaStateListener.class)));
-
-        mediaRouteCtrl.setPlayerStateForMediaItemState(MediaItemStatus.PLAYBACK_STATE_PLAYING);
-
-        assertFalse(mediaRouteCtrl.shouldResetState(null));
-        assertTrue(mediaRouteCtrl.shouldResetState(mock(MediaStateListener.class)));
-
-        mediaRouteCtrl.setPlayerStateForMediaItemState(MediaItemStatus.PLAYBACK_STATE_FINISHED);
-        mediaRouteCtrl.setMediaStateListener(listener);
-
-        assertTrue(mediaRouteCtrl.shouldResetState(null));
-        assertTrue(mediaRouteCtrl.shouldResetState(mock(MediaStateListener.class)));
-        assertTrue(mediaRouteCtrl.shouldResetState(listener));
-
-        mediaRouteCtrl.setPlayerStateForMediaItemState(MediaItemStatus.PLAYBACK_STATE_PLAYING);
-
-        assertTrue(mediaRouteCtrl.shouldResetState(null));
-        assertTrue(mediaRouteCtrl.shouldResetState(mock(MediaStateListener.class)));
-        assertFalse(mediaRouteCtrl.shouldResetState(listener));
-    }
-
-    /**
      * Test method for {@link AbstractMediaRouteController#addUiListener(UiListener)} and
      * {@link AbstractMediaRouteController#removeMediaStateListener(MediaStateListener)}.
      */