[Media Router] Implement JoinRoute + update CreateRoute API.

chrome/browser/media/router/media_router_mojo_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 43 matching lines @@
   static void BindToRequest(
       const std::string& extension_id,
       content::BrowserContext* context,
       mojo::InterfaceRequest<interfaces::MediaRouterObserver> request);
 
   // MediaRouter implementation.
   // Execution of the requests is delegated to the Do* methods, which can be
   // enqueued for later use if the extension is temporarily suspended.
   void CreateRoute(const MediaSource::Id& source_id,
                    const MediaSink::Id& sink_id,
+                   const GURL& origin,
+                   int tab_id,
                    const MediaRouteResponseCallback& callback) override;
+  void JoinRoute(const MediaSource::Id& source_id,
+                 const std::string& presentation_id,
+                 const GURL& origin,
+                 int tab_id,
+                 const MediaRouteResponseCallback& callback) override;
   void CloseRoute(const MediaRoute::Id& route_id) override;
   void SendRouteMessage(const MediaRoute::Id& route_id,
                         const std::string& message,
                         const SendRouteMessageCallback& callback) override;
   void ClearIssue(const Issue::Id& issue_id) override;
   void RegisterMediaSinksObserver(MediaSinksObserver* observer) override;
   void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override;
   void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
   void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
   void AddIssuesObserver(IssuesObserver* observer) override;
@@ skipping 28 matching lines @@
   // Runs a closure if the extension monitored by |extension_monitor_| is
   // active, or defers it for later execution if the extension is suspended.
   void RunOrDefer(const base::Closure& request);
 
   // Dispatches the Mojo requests queued in |pending_requests_|.
   void ExecutePendingRequests();
 
   // These calls invoke methods in the component extension via Mojo.
   void DoCreateRoute(const MediaSource::Id& source_id,
                      const MediaSink::Id& sink_id,
+                     const std::string& origin,
+                     int tab_id,
                      const MediaRouteResponseCallback& callback);
+  void DoJoinRoute(const MediaSource::Id& source_id,
+                   const std::string& presentation_id,
+                   const std::string& origin,
+                   int tab_id,
+                   const MediaRouteResponseCallback& callback);
   void DoCloseRoute(const MediaRoute::Id& route_id);
   void DoSendSessionMessage(const MediaRoute::Id& route_id,
                             const std::string& message,
                             const SendRouteMessageCallback& callback);
   void DoClearIssue(const Issue::Id& issue_id);
-  void DoStartObservingMediaSinks(const std::string& source_id);
-  void DoStopObservingMediaSinks(const std::string& source_id);
+  void DoStartObservingMediaSinks(const MediaSource::Id& source_id);
+  void DoStopObservingMediaSinks(const MediaSource::Id& source_id);
   void DoStartObservingMediaRoutes();
   void DoStopObservingMediaRoutes();
   void DoStartObservingIssues();
   void DoStopObservingIssues();
 
   // mojo::ErrorHandler implementation.
   void OnConnectionError() override;
 
   // interfaces::MediaRouterObserver implementation.
   void ProvideMediaRouter(
@@ skipping 42 matching lines @@
   std::string instance_id_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterMojoImpl);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_MOJO_IMPL_H_