[Cast,Android,Presentation API] Split CastRouteController into session and media routes.

chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/CastRouteController.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/CastRouteController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/CastRouteController.java b/chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/CastRouteController.java
index 13536c0efecf5069478188277bba639db9aa3b38..0e761a08f84242cc6c09b217a9d593f8f07f3add 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/CastRouteController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/router/cast/CastRouteController.java
@@ -158,7 +158,6 @@ public class CastRouteController implements RouteController, MediaNotificationLi
     private String mApplicationStatus;
     private ApplicationMetadata mApplicationMetadata;
     private boolean mStoppingApplication;
-    private boolean mDetached;
     private MediaNotificationInfo.Builder mNotificationBuilder;
     private RemoteMediaPlayer mMediaPlayer;
 
@@ -255,13 +254,6 @@ public class CastRouteController implements RouteController, MediaNotificationLi
         }
     }
 
-    public CastRouteController createJoinedController(String mediaRouteId, String origin, int tabId,
-            MediaSource source) {
-        return new CastRouteController(mApiClient, mSessionId, mApplicationMetadata,
-                mApplicationStatus, mCastDevice, mediaRouteId, origin, tabId, source,
-                mRouteDelegate);
-    }
-
     /**
      * @return the id of the Cast session controlled by the route.
      */
@@ -315,17 +307,6 @@ public class CastRouteController implements RouteController, MediaNotificationLi
         return mTabId;
     }
 
-    @Override
-    public void markDetached() {
-        mDetached = true;
-    }
-
-    @Override
-    public boolean isDetached() {
-        return mDetached;
-    }
-
-
     /////////////////////////////////////////////////////////////////////////////////////////////
     // MediaNotificationListener implementation.
 
@@ -402,15 +383,11 @@ public class CastRouteController implements RouteController, MediaNotificationLi
                         mSessionId = null;
                         mApiClient = null;
 
-                        mRouteDelegate.onRouteClosed(CastRouteController.this);
+                        mRouteDelegate.onRouteClosed(getRouteId());
                         mStoppingApplication = false;
 
-                        // The detached route will be closed only if another route joined
-                        // the same session so it will take over the notification.
-                        if (!mDetached) {
-                            MediaNotificationManager.hide(
-                                    mTabId, R.id.presentation_notification);
-                        }
+                        MediaNotificationManager.hide(
+                                mTabId, R.id.presentation_notification);
                     }
                 });
     }