Non-Local Join for Media Router and Presentation API

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

Index: chrome/browser/media/android/router/media_router_android.cc
diff --git a/chrome/browser/media/android/router/media_router_android.cc b/chrome/browser/media/android/router/media_router_android.cc
index 10e288989c5bb79977469146b195f6bb5ac00d54..485df638d4595719e83ef22b969ea5673ac213c1 100644
--- a/chrome/browser/media/android/router/media_router_android.cc
+++ b/chrome/browser/media/android/router/media_router_android.cc
@@ -105,6 +105,15 @@ void MediaRouterAndroid::CreateRoute(
       route_request_id);
 }
 
+void MediaRouterAndroid::ConnectRouteByRouteId(
+    const MediaSource::Id& source,
+    const MediaRoute::Id& route_id,
+    const GURL& origin,
+    content::WebContents* web_contents,
+    const std::vector<MediaRouteResponseCallback>& callbacks) {
+  NOTIMPLEMENTED();
+}
+
 void MediaRouterAndroid::JoinRoute(
     const MediaSource::Id& source_id,
     const std::string& presentation_id,
@@ -260,6 +269,9 @@ void MediaRouterAndroid::UnregisterMediaSinksObserver(
 void MediaRouterAndroid::RegisterMediaRoutesObserver(
     MediaRoutesObserver* observer) {
   DVLOG(2) << "Added MediaRoutesObserver: " << observer;
+  if (!observer->source_id().empty())
+    NOTIMPLEMENTED() << "Joinable routes query not implemented.";
+
   routes_observers_.AddObserver(observer);
 }
 
@@ -365,7 +377,8 @@ void MediaRouterAndroid::OnRouteCreated(
 
   active_routes_.push_back(route);
   FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_,
-                    OnRoutesUpdated(active_routes_));
+      OnRoutesUpdated(active_routes_,
+          std::vector<MediaRoute::Id>()));

[apacible, 2015/12/18 22:34:19]

nit: Does this fit on the previous line? 

[matt.boetger, 2015/12/18 23:37:14]

Done.

 }
 
 void MediaRouterAndroid::OnRouteRequestError(
@@ -396,7 +409,8 @@ void MediaRouterAndroid::OnRouteClosed(JNIEnv* env,
     }
 
   FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_,
-                    OnRoutesUpdated(active_routes_));
+      OnRoutesUpdated(active_routes_,
+          std::vector<MediaRoute::Id>()));

[apacible, 2015/12/18 22:34:19]

nit: Does this fit on the previous line? 

[matt.boetger, 2015/12/18 23:37:14]

Done.

 }
 
 void MediaRouterAndroid::OnMessageSentResult(