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 614d4d9ec7aa1c988a527856dadcfe0bd18eb3ce..f783aacd27844ae81be6ddee3215ff352c5f1768 100644
--- a/chrome/browser/media/android/router/media_router_android.cc
+++ b/chrome/browser/media/android/router/media_router_android.cc
@@ -104,6 +104,15 @@ void MediaRouterAndroid::CreateRoute(
       route_request_id);
 }
 
+void MediaRouterAndroid::JoinRouteByRouteId(
+    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,
@@ -259,6 +268,9 @@ void MediaRouterAndroid::UnregisterMediaSinksObserver(
 void MediaRouterAndroid::RegisterMediaRoutesObserver(
     MediaRoutesObserver* observer) {
   DVLOG(2) << "Added MediaRoutesObserver: " << observer;
+  const std::string& source_id = observer->source_id();
+  if (!source_id.empty())
+      NOTIMPLEMENTED() << "Joinable routes query not implemented.";

[imcheng, 2015/12/01 23:45:06]

-2 indent, new line after

[matt.boetger, 2015/12/03 01:19:20]

Done.

   routes_observers_.AddObserver(observer);
 }
 
@@ -364,7 +376,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>()));
 }
 
 void MediaRouterAndroid::OnRouteRequestError(
@@ -395,7 +408,8 @@ void MediaRouterAndroid::OnRouteClosed(JNIEnv* env,
     }
 
   FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_,
-                    OnRoutesUpdated(active_routes_));
+      OnRoutesUpdated(active_routes_,
+          std::vector<MediaRoute::Id>()));
 }
 
 void MediaRouterAndroid::OnMessageSentResult(