Refactor Clank cast connect logic

chrome/android/java/src/org/chromium/chrome/browser/media/remote/MediaRouteController.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/remote/MediaRouteController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/MediaRouteController.java b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/MediaRouteController.java
index 858001ed796a8861b907849abdb68197b9316155..aead18801a6882724248eafe09da7c8f67894cc1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/MediaRouteController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/MediaRouteController.java
@@ -40,17 +40,6 @@ public interface MediaRouteController extends TransportControl.Listener {
         public void onSeekCompleted();
 
         /**
-         * Called when the current route is ready to be used
-         */
-        public void onPrepared();
-
-        /**
-         * Called when a new route has been selected for Cast
-         * @param name the name of the route
-         */
-        public void onRouteSelected(String name);
-
-        /**
          * Called when the current route is unselected
          */
         public void onRouteUnselected();
@@ -70,6 +59,64 @@ public interface MediaRouteController extends TransportControl.Listener {
          * @return the poster bitmap
          */
         public Bitmap getPosterBitmap();
+
+        /**
+         * Pause the local player, used when switching from local to remote
+         */
+        public void pauseLocal();
+
+        /**
+         * @return the current position in the local player
+         */
+        public int getLocalPosition();
+
+        /**
+         * Switch between the local and remote players, so that controls
+         * etc. go to the correct player.
+         */
+        public void switchToRemotePlayer();

[whywhat, 2015/10/14 13:28:50]

this methods expose some info about the media player implementation. how about
naming them more flexibly, e.g. onBeforeCast(), onAfterCast(), onCastStop() etc?

[aberent, 2015/10/15 10:31:37]

Done.

+
+        /**
+         * Switch between the local and remote players, so that controls

[whywhat, 2015/10/14 13:28:50]

nit: duplicate comment with the method above, they should be different for
different methods probably

[aberent, 2015/10/15 10:31:38]

Done.

+         * etc. go to the correct player.
+         */
+        public void switchToLocalPlayer();
+
+        /**
+         * @return the source URL

[whywhat, 2015/10/14 13:28:50]

nit: javadoc seems generated, fix it here and below

[aberent, 2015/10/15 10:31:38]

Done.

+         */
+        public String getSourceUrl();
+
+        /**
+         * @return the Cookies
+         */
+        public String getCookies();
+
+        /**
+         * @return the User Agent string
+         */
+        public String getUserAgent();
+
+        /**
+         * @return
+         */
+        public String getFrameUrl();
+
+        /**
+         * @return
+         */
+        public long getStartPositionMillis();
+
+        /**
+         *
+         */
+        public void onPlayingRemotely(String routeName);
+
+        public boolean isPauseRequested();
+
+        public boolean isSeekRequested();
+
+        public int getSeekLocation();

[whywhat, 2015/10/14 13:28:50]

nit: I don't think visibility modifiers are needed for interfaces? could be
omitted as it's always public, right?

[aberent, 2015/10/15 10:31:38]

Done.

     }
 
     /**
@@ -306,4 +353,10 @@ public interface MediaRouteController extends TransportControl.Listener {
      * @return the poster bitmap, or Null.
      */
     public Bitmap getPoster();
+
+    /**

[whywhat, 2015/10/14 13:28:50]

nit: javadoc, the name seems confusing

[aberent, 2015/10/15 10:31:38]

See my reply to dgn@ on implementation.

+     * @param mMediaStateListener
+     * @return
+     */
+    public boolean videoTakesOverCastDevice(MediaStateListener mediaStateListener);
 }