[Media Router] Merge createMediaRouteController and setMediaRouteStatusObserver in bindings

chrome/renderer/resources/extensions/media_router_bindings.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var mediaRouter;
 
 define('media_router_bindings', [
     'chrome/common/media_router/mojo/media_controller.mojom',
     'chrome/common/media_router/mojo/media_router.mojom',
     'chrome/common/media_router/mojo/media_status.mojom',
@@ skipping 547 matching lines @@
      * @type {function(string, string, !SinkSearchCriteria): string}
      */
     this.searchSinks = null;
 
     /**
      * @type {function()}
      */
     this.provideSinks = null;
 
     /**
-     * @type {function(string, !bindings.InterfaceRequest): !Promise<boolean>}
+     * @type {function(string, !bindings.InterfaceRequest,
+     *            !mediaStatusMojom.MediaStatusObserverPtr): !Promise<boolean>}
      */
     this.createMediaRouteController = null;
-
-    /**
-     * @type {function(string, !mediaStatusMojom.MediaStatusObserverPtr)}
-     */
-    this.setMediaRouteStatusObserver = null;
   };
 
   /**
    * Routes calls from Media Router to the provider manager extension.
    * Registered with the MediaRouter stub.
    * @param {!MediaRouter} MediaRouter proxy to call into the
    * Media Router mojo interface.
    * @constructor
    */
   function MediaRouteProvider(mediaRouter) {
@@ skipping 33 matching lines @@
       'joinRoute',
       'createRoute',
       'stopObservingMediaSinks',
       'startObservingMediaRoutes',
       'connectRouteByRouteId',
       'enableMdnsDiscovery',
       'updateMediaSinks',
       'searchSinks',
       'provideSinks',
       'createMediaRouteController',
-      'setMediaRouteStatusObserver',
       'onBeforeInvokeHandler'
     ];
     requiredHandlers.forEach(function(nextHandler) {
       if (handlers[nextHandler] === undefined) {
         console.error(nextHandler + ' handler not registered.');
       }
     });
   }
 
   /**
@@ skipping 272 matching lines @@
    * @param {string} providerName
    * @param {!Array<!mediaRouterMojom.MediaSink>} sinks
    */
   MediaRouteProvider.prototype.provideSinks = function(providerName, sinks) {
     this.handlers_.onBeforeInvokeHandler();
     this.handlers_.provideSinks(providerName, sinks);
   };
 
   /**
    * Creates a controller for the given route and binds the given
-   * InterfaceRequest to it.
+   * InterfaceRequest to it, and registers an observer for media status updates
+   * for the route.
    * @param {string} routeId
    * @param {!bindings.InterfaceRequest} controllerRequest
+   * @param {!mediaStatusMojom.MediaStatusObserverPtr} observer
    * @return {!Promise<!{success: boolean}>} Resolves to true if a controller
    *     is created. Resolves to false if a controller cannot be created, or if
    *     the controller is already bound.
    */
   MediaRouteProvider.prototype.createMediaRouteController = function(
-      routeId, controllerRequest) {
-    // TODO(imcheng): Remove this check when M59 is in stable.
+      routeId, controllerRequest, observer) {
+    // TODO(imcheng): Remove this check when M60 is in stable.
     if (!this.handlers_.createMediaRouteController) {
       return Promise.resolve({success: false});
     }
 
     this.handlers_.onBeforeInvokeHandler();
-    this.handlers_.createMediaRouteController(routeId, controllerRequest)
-        .then(controller => {success: true},
-              e => {success: false});
-  }
-
-  /**
-   * Sets the MediaStatus oberver for a given route. MediaStatus updates are
-   * notified via the given observer interface.
-   * @param {string} routeId
-   * @param {!mediaStatusMojom.MediaStatusObserverPtr} observer
-   */
-  MediaRouteProvider.prototype.setMediaRouteStatusObserver = function(
-      routeId, observer) {
-    // TODO(imcheng): Remove this check when M59 is in stable.
-    if (!this.handlers_.setMediaRouteStatusObserver) {
-      return;
-    }
-    this.handlers_.onBeforeInvokeHandler();
-    this.handlers_.setMediaRouteStatusObserver(routeId, observer);
+    return this.handlers_
+        .createMediaRouteController(routeId, controllerRequest, observer)
+        .then(controller => {success: true}, e => {success: false});

[imcheng, 2017/04/24 21:04:10]

One more thing: let's make this return void for now. I will need to update the
API on the extension side anyway.

[takumif, 2017/04/24 21:26:24]

Done.

   };
 
   mediaRouter = new MediaRouter(new mediaRouterMojom.MediaRouterPtr(
       frameInterfaces.getInterface(mediaRouterMojom.MediaRouter.name)));
 
   return mediaRouter;
 });