Non-Local Join for Media Router and Presentation API

chrome/browser/media/router/test_helper.h

Index: chrome/browser/media/router/test_helper.h
diff --git a/chrome/browser/media/router/test_helper.h b/chrome/browser/media/router/test_helper.h
index 38f051792e6cc76016b7204906685783999afb23..930402d2204303049ea099b4e4c1792cd621c320 100644
--- a/chrome/browser/media/router/test_helper.h
+++ b/chrome/browser/media/router/test_helper.h
@@ -97,6 +97,13 @@ class MockMediaRouteProvider : public interfaces::MediaRouteProvider {
                     const mojo::String& origin,
                     int tab_id,
                     const JoinRouteCallback& callback));
+  MOCK_METHOD6(ConnectRouteByRouteId,
+               void(const mojo::String& source_urn,
+                    const mojo::String& route_id,
+                    const mojo::String& presentation_id,
+                    const mojo::String& origin,
+                    int tab_id,
+                    const JoinRouteCallback& callback));
   MOCK_METHOD1(CloseRoute, void(const mojo::String& route_id));
   MOCK_METHOD1(StartObservingMediaSinks, void(const mojo::String& source));
   MOCK_METHOD1(StopObservingMediaSinks, void(const mojo::String& source));
@@ -121,8 +128,8 @@ class MockMediaRouteProvider : public interfaces::MediaRouteProvider {
                void(const mojo::String& route_id));
   MOCK_METHOD1(OnPresentationSessionDetached,
                void(const mojo::String& route_id));
-  MOCK_METHOD0(StartObservingMediaRoutes, void());
-  MOCK_METHOD0(StopObservingMediaRoutes, void());
+  MOCK_METHOD1(StartObservingMediaRoutes, void(const mojo::String& source));
+  MOCK_METHOD1(StopObservingMediaRoutes, void(const mojo::String& source));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockMediaRouteProvider);
@@ -138,10 +145,12 @@ class MockMediaSinksObserver : public MediaSinksObserver {
 
 class MockMediaRoutesObserver : public MediaRoutesObserver {
  public:
-  explicit MockMediaRoutesObserver(MediaRouter* router);
+  explicit MockMediaRoutesObserver(MediaRouter* router,
+      const MediaSource::Id source_id = std::string());
   ~MockMediaRoutesObserver() override;
 
-  MOCK_METHOD1(OnRoutesUpdated, void(const std::vector<MediaRoute>& sinks));
+  MOCK_METHOD2(OnRoutesUpdated, void(const std::vector<MediaRoute>& routes,
+      const std::vector<MediaRoute::Id>& joinable_route_ids));
 };
 
 class MockEventPageTracker : public extensions::EventPageTracker {