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 1c5bf8d05e08db47e1727301b76b237270522a5e..5329caed985c8c5e14970f3527f9647d0f05f219 100644
--- a/chrome/browser/media/router/test_helper.h
+++ b/chrome/browser/media/router/test_helper.h
@@ -121,8 +121,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 +138,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();
 
-  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 {