[Media Router] Assign each route a current cast mode if possible

chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js

Index: chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
diff --git a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
index d58a5ac8286a0b1555746cb36be4af4afd094faa..4e9e32662cd14341e2e86f98e3e98632bfd80593 100644
--- a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
+++ b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js
@@ -618,22 +618,6 @@ Polymer({
   },
 
   /**
-   * @param {!media_router.Route} route
-   * @return {number} Bitmask of cast modes available for the sink of |route|.
-   *     There will be no more than 1 bit set if the user has selected a
-   *     specific cast mode.
-   */
-  computeAvailableCastModesForRoute_: function(route) {
-    if (route && route.sinkId && this.sinkMap_[route.sinkId]) {
-      var sinkCastModes = this.sinkMap_[route.sinkId].castModes;
-      return this.shownCastModeValue_ == media_router.CastModeType.AUTO ?
-          sinkCastModes :
-          this.shownCastModeValue_ & sinkCastModes;
-    }
-    return 0;
-  },
-
-  /**
    * If |allSinks| supports only a single cast mode, returns that cast mode.
    * Otherwise, returns AUTO_MODE. Only called if |userHasSelectedCastMode_| is
    * |false|.
@@ -707,6 +691,18 @@ Polymer({
   },
 
   /**
+   * @param {?Element} element Element to compute padding for.
+   * @return {number} Computes the amount of vertical padding (top + bottom) on
+   *     |element|.
+   * @private
+   */
+  computeElementVerticalPadding_: function(element) {
+    var paddingBottom, paddingTop;
+    [paddingBottom, paddingTop] = this.getElementVerticalPadding_(element);
+    return paddingBottom + paddingTop;
+  },
+
+  /**
    * @param {?media_router.MediaRouterView} view The current view.
    * @param {?media_router.Issue} issue The current issue.
    * @return {boolean} Whether or not to hide the header.
@@ -820,18 +816,6 @@ Polymer({
   },
 
   /**
-   * @param {?Element} element Element to compute padding for.
-   * @return {number} Computes the amount of vertical padding (top + bottom) on
-   *     |element|.
-   * @private
-   */
-  computeElementVerticalPadding_: function(element) {
-    var paddingBottom, paddingTop;
-    [paddingBottom, paddingTop] = this.getElementVerticalPadding_(element);
-    return paddingBottom + paddingTop;
-  },
-
-  /**
    * Computes an array of substring indices that mark where substrings of
    * |searchString| occur in |sinkName|.
    *
@@ -1193,6 +1177,15 @@ Polymer({
   },
 
   /**
+   * @param {?media_router.Route} route Route to get the sink for.
+   * @return {?media_router.Sink|undefined} Sink associated with |route| or
+   *     undefined if we don't have data for the sink.
+   */
+  getSinkForRoute_: function(route) {
+    return this.sinkMap_[route.sinkId];
+  },
+
+  /**
    * @param {?Element} element Conditionally-templated element to check.
    * @return {boolean} Whether |element| is considered present in the document
    *     as a conditionally-templated element. This does not check the |hidden|