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

chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
index 31b52dfe30ed6c86f71f95301dc229b103232ab3..fbe0d70592760b631a8fdd39bf2eb38a3c24f8d7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
@@ -31,13 +31,6 @@ public class ChromeMediaRouter implements MediaRouteManager {
 
     private static final String TAG = "cr_MediaRouter";
 
-    private static final String MEDIA_ROUTE_ID_PREFIX = "route:";
-    private static final String MEDIA_ROUTE_ID_SEPARATOR = "/";
-    private static final int MEDIA_ROUTE_ID_COMPONENTS_NUM = 3;
-    private static final int MEDIA_ROUTE_ID_PRESENTATION_ID_INDEX = 0;
-    private static final int MEDIA_ROUTE_ID_SINK_ID_INDEX = 1;
-    private static final int MEDIA_ROUTE_ID_SOURCE_ID_INDEX = 2;
-
     private final long mNativeMediaRouterAndroid;
     private final List<MediaRouteProvider> mRouteProviders = new ArrayList<MediaRouteProvider>();
     private final Map<String, MediaRouteProvider> mSinkIdsToProviders =
@@ -68,29 +61,6 @@ public class ChromeMediaRouter implements MediaRouteManager {
         }
     }
 
-    public static String createMediaRouteId(
-            String presentationId, String sinkId, String sourceUrn) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(MEDIA_ROUTE_ID_PREFIX);
-        builder.append(presentationId);
-        builder.append(MEDIA_ROUTE_ID_SEPARATOR);
-        builder.append(sinkId);
-        builder.append(MEDIA_ROUTE_ID_SEPARATOR);
-        builder.append(sourceUrn);
-        return builder.toString();
-    }
-
-    public static String[] parseMediaRouteId(String routeId) {
-        if (!routeId.startsWith(MEDIA_ROUTE_ID_PREFIX)) return null;
-
-        String[] routeComponents = routeId.substring(MEDIA_ROUTE_ID_PREFIX.length())
-                .split(MEDIA_ROUTE_ID_SEPARATOR, MEDIA_ROUTE_ID_COMPONENTS_NUM);
-
-        if (routeComponents.length != MEDIA_ROUTE_ID_COMPONENTS_NUM) return null;
-
-        return routeComponents;
-    }
-
     @Override
     public void onSinksReceived(
             String sourceId, MediaRouteProvider provider, List<MediaSink> sinks) {
@@ -233,8 +203,7 @@ public class ChromeMediaRouter implements MediaRouteManager {
             return;
         }
 
-        String routeId = createMediaRouteId(presentationId, sinkId, sourceId);
-        provider.createRoute(sourceId, sinkId, routeId, origin, tabId, requestId);
+        provider.createRoute(sourceId, sinkId, presentationId, origin, tabId, requestId);
     }
 
     /**