Non-Local Join for Media Router and Presentation API

chrome/browser/media/android/router/media_router_android.h

Index: chrome/browser/media/android/router/media_router_android.h
diff --git a/chrome/browser/media/android/router/media_router_android.h b/chrome/browser/media/android/router/media_router_android.h
index b7d481b3edc605f012019b44cdf35c3166c12e53..59336c8fca4812b732d0fb3bece90b2adff2b095 100644
--- a/chrome/browser/media/android/router/media_router_android.h
+++ b/chrome/browser/media/android/router/media_router_android.h
@@ -40,6 +40,12 @@ class MediaRouterAndroid : public MediaRouter {
       const GURL& origin,
       content::WebContents* web_contents,
       const std::vector<MediaRouteResponseCallback>& callbacks) override;
+  void JoinRouteByRouteId(
+      const MediaSource::Id& source,
+      const MediaRoute::Id& route_id,
+      const GURL& origin,
+      content::WebContents* web_contents,
+      const std::vector<MediaRouteResponseCallback>& callbacks) override;
   void CloseRoute(const MediaRoute::Id& route_id) override;
   void SendRouteMessage(const MediaRoute::Id& route_id,
                         const std::string& message,
@@ -115,7 +121,10 @@ class MediaRouterAndroid : public MediaRouter {
       scoped_ptr<base::ObserverList<MediaSinksObserver>>>;
   MediaSinkObservers sinks_observers_;
 
-  base::ObserverList<MediaRoutesObserver> routes_observers_;
+  using MediaRouteObservers = base::ScopedPtrHashMap<
+      MediaSource::Id,
+      scoped_ptr<base::ObserverList<MediaRoutesObserver>>>;
+  MediaRouteObservers routes_observers_;
 
   struct MediaRouteRequest {
     MediaRouteRequest(