Pass origin to StartObservingMediaSinks.

extensions/renderer/resources/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', [
     'mojo/public/js/bindings',
     'mojo/public/js/core',
     'content/public/renderer/service_provider',
@@ skipping 246 matching lines @@
    * @return {boolean}
    */
   MediaRouter.prototype.getKeepAlive = function() {
     return this.keepAlive_ != null;
   };
 
   /**
    * Called by the provider manager when a sink list for a given source is
    * updated.
    * @param {!string} sourceUrn
+   * @param {!string} origin
    * @param {!Array<!MediaSink>} sinks
    */
-  MediaRouter.prototype.onSinksReceived = function(sourceUrn, sinks) {
-    this.service_.onSinksReceived(sourceUrn, sinks.map(sinkToMojo_));
+  MediaRouter.prototype.onSinksReceived = function(
+      sourceUrn, origin, sinks) {
+    this.service_.onSinksReceived(sourceUrn, origin, sinks.map(sinkToMojo_));

[mark a. foltz, 2016/03/03 22:58:37]

How will this handle an extension that does not use the new API?

Rather than sticking an optional argument on the end, I would use a type check
on the second argument to determine which API is in use.

[matt.boetger, 2016/03/04 00:22:11]

Done.

   };
 
   /**
    * Called by the provider manager to keep the extension from suspending
    * if it enters a state where suspension is undesirable (e.g. there is an
    * active MediaRoute.)
    * If keepAlive is true, the extension is kept alive.
    * If keepAlive is false, the extension is allowed to suspend.
    * @param {boolean} keepAlive
    */
@@ skipping 242 matching lines @@
         console.error(nextHandler + ' handler not registered.');
       }
     });
   }
 
   /**
    * Starts querying for sinks capable of displaying the media source
    * designated by |sourceUrn|.  Results are returned by calling
    * OnSinksReceived.
    * @param {!string} sourceUrn
+   * @param {!string} origin
    */
   MediaRouteProvider.prototype.startObservingMediaSinks =
-      function(sourceUrn) {
-    this.handlers_.startObservingMediaSinks(sourceUrn);
+      function(sourceUrn, origin) {
+    this.handlers_.startObservingMediaSinks(sourceUrn, origin);
   };
 
   /**
    * Stops querying for sinks capable of displaying |sourceUrn|.
    * @param {!string} sourceUrn
+   * @param {!string} origin
    */
   MediaRouteProvider.prototype.stopObservingMediaSinks =
-      function(sourceUrn) {
-    this.handlers_.stopObservingMediaSinks(sourceUrn);
+      function(sourceUrn, origin) {
+    this.handlers_.stopObservingMediaSinks(sourceUrn, origin);
   };
 
   /**
    * Requests that |sinkId| render the media referenced by |sourceUrn|. If the
    * request is from the Presentation API, then origin and tabId will
    * be populated.
    * @param {!string} sourceUrn Media source to render.
    * @param {!string} sinkId Media sink ID.
    * @param {!string} presentationId Presentation ID from the site
    *     requesting presentation. TODO(mfoltz): Remove.
@@ skipping 178 matching lines @@
   };
 
   mediaRouter = new MediaRouter(connector.bindHandleToProxy(
       serviceProvider.connectToService(
           mediaRouterMojom.MediaRouter.name),
       mediaRouterMojom.MediaRouter));
 
   return mediaRouter;
 });