Non-Local Join for Media Router and Presentation API

chrome/browser/media/router/media_router_mojo_impl.cc

 // 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.
 
 #include "chrome/browser/media/router/media_router_mojo_impl.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 55 matching lines @@
 MediaRouterMediaRoutesObserver(MediaRouterMojoImpl* router)
     : MediaRoutesObserver(router),
       router_(router) {
   DCHECK(router);
 }
 
 MediaRouterMojoImpl::MediaRouterMediaRoutesObserver::
 ~MediaRouterMediaRoutesObserver() {
 }
 
+MediaRouterMojoImpl::MediaRoutesQuery::MediaRoutesQuery() = default;
+
+MediaRouterMojoImpl::MediaRoutesQuery::~MediaRoutesQuery() = default;
+
 MediaRouterMojoImpl::MediaSinksQuery::MediaSinksQuery() = default;
 
 MediaRouterMojoImpl::MediaSinksQuery::~MediaSinksQuery() = default;
 
 void MediaRouterMojoImpl::MediaRouterMediaRoutesObserver::OnRoutesUpdated(
-    const std::vector<media_router::MediaRoute>& routes) {
+    const std::vector<media_router::MediaRoute>& routes,
+    const std::vector<media_router::MediaRoute::Id>& joinable_route_ids) {
+

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

remove empty line

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

Done.

   bool has_local_route =
       std::find_if(routes.begin(), routes.end(),
                    [](const media_router::MediaRoute& route) {
                       return route.is_local(); }) !=
       routes.end();
 
   // |this| will be deleted in UpdateHasLocalRoute() if |has_local_route| is
   // false. Note that ObserverList supports removing an observer while
   // iterating through it.
   router_->UpdateHasLocalRoute(has_local_route);
@@ skipping 110 matching lines @@
       !(it->second->observers.might_have_observers())) {
     DVLOG_WITH_INSTANCE(1)
         << "Received sink list without any active observers: " << media_source;
   } else {
     FOR_EACH_OBSERVER(MediaSinksObserver, it->second->observers,
                       OnSinksReceived(sinks_converted));
   }
 }
 
 void MediaRouterMojoImpl::OnRoutesUpdated(
-    mojo::Array<interfaces::MediaRoutePtr> routes) {
+    const mojo::String& media_source,
+    mojo::Array<interfaces::MediaRoutePtr> routes,
+    mojo::Array<mojo::String> joinable_route_ids) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   DVLOG_WITH_INSTANCE(1) << "OnRoutesUpdated";
 
   std::vector<MediaRoute> routes_converted;
   routes_converted.reserve(routes.size());
 
-  for (size_t i = 0; i < routes.size(); ++i) {
+  std::vector<MediaRoute::Id> joinable_routes_converted;
+  joinable_routes_converted.reserve(joinable_route_ids.size());
+
+  for (size_t i = 0; i < routes.size(); ++i)
     routes_converted.push_back(routes[i].To<MediaRoute>());
+
+  for (size_t i = 0; i < joinable_route_ids.size(); ++i)
+    joinable_routes_converted.push_back(joinable_route_ids[i].get());

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

.get() not needed - conversion to std::string should be implicit

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

Done.

+
+  auto it = routes_queries_.find(media_source);

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

It should probably be better to do this check before performing the conversions
-- same with OnSinksReceived:

if (no observers) {
  DVLOG(...)
  return;
}

[std::vector allocation / conversion]
FOR_EACH_OBSERVER(...);

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

Done.

+  if (it == routes_queries_.end() ||
+      !(it->second->observers.might_have_observers())) {
+    DVLOG_WITH_INSTANCE(1)
+        << "Received route list without any active observers: " << media_source;
+  } else {
+    FOR_EACH_OBSERVER(MediaRoutesObserver, it->second->observers,
+                      OnRoutesUpdated(routes_converted,
+                                      joinable_routes_converted));
   }
-
-  FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_,
-                    OnRoutesUpdated(routes_converted));
 }
 
 void MediaRouterMojoImpl::RouteResponseReceived(
     const std::string& presentation_id,
     const std::vector<MediaRouteResponseCallback>& callbacks,
     interfaces::MediaRoutePtr media_route,
     const mojo::String& error_text) {
   scoped_ptr<MediaRoute> route;
   std::string actual_presentation_id;
   std::string error;
@@ skipping 64 matching lines @@
     return;
   }
 
   int tab_id = SessionTabHelper::IdForTab(web_contents);
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoJoinRoute,
                         base::Unretained(this), source_id, presentation_id,
                         origin.is_empty() ? "" : origin.spec(), tab_id,
                         callbacks));
 }
 
+void MediaRouterMojoImpl::JoinRouteByRouteId(
+    const MediaSource::Id& source_id,
+    const MediaRoute::Id& route_id,
+    const GURL& origin,
+    content::WebContents* web_contents,
+    const std::vector<MediaRouteResponseCallback>& callbacks) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  if (!origin.is_valid()) {
+    DVLOG_WITH_INSTANCE(1) << "Invalid origin: " << origin;
+    for (const MediaRouteResponseCallback& callback : callbacks)
+      callback.Run(nullptr, "", "Invalid origin");
+    return;
+  }
+
+  int tab_id = SessionTabHelper::IdForTab(web_contents);
+  std::string presentation_id("non-local-join_");
+  presentation_id += route_id;
+  RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoJoinRoute,
+                        base::Unretained(this), source_id, presentation_id,
+                        origin.is_empty() ? "" : origin.spec(), tab_id,
+                        callbacks));
+}
+
 void MediaRouterMojoImpl::CloseRoute(const MediaRoute::Id& route_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoCloseRoute,
                         base::Unretained(this), route_id));
 }
 
 void MediaRouterMojoImpl::SendRouteMessage(
     const MediaRoute::Id& route_id,
     const std::string& message,
@@ skipping 87 matching lines @@
                             base::Unretained(this), source_id));
     } else {
       sinks_queries_.erase(source_id);
     }
   }
 }
 
 void MediaRouterMojoImpl::RegisterMediaRoutesObserver(
     MediaRoutesObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!routes_observers_.HasObserver(observer));
+  const MediaSource::Id source_id = observer->source_id();
+  auto* routes_query = routes_queries_.get(source_id);
+  if (!routes_query) {
+    routes_query = new MediaRoutesQuery;
+    routes_queries_.add(source_id, make_scoped_ptr(routes_query));
+  } else {
+    DCHECK(!routes_query->observers.HasObserver(observer));
+  }
 
+  routes_query->observers.AddObserver(observer);
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoStartObservingMediaRoutes,
-                        base::Unretained(this)));
-  routes_observers_.AddObserver(observer);
+                        base::Unretained(this), source_id));
 }
 
 void MediaRouterMojoImpl::UnregisterMediaRoutesObserver(
     MediaRoutesObserver* observer) {
-  if (!routes_observers_.HasObserver(observer))
+  const MediaSource::Id source_id = observer->source_id();
+  auto* routes_query = routes_queries_.get(source_id);
+  if (!routes_query || !routes_query->observers.HasObserver(observer)) {
     return;
+  }
 
-  routes_observers_.RemoveObserver(observer);
-  if (!routes_observers_.might_have_observers()) {
+  // If we are removing the final observer for the source, then stop
+  // observing routes for it.
+  // might_have_observers() is reliable here on the assumption that this call
+  // is not inside the ObserverList iteration.
+  routes_query->observers.RemoveObserver(observer);
+  if (!routes_query->observers.might_have_observers()) {
     RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoStopObservingMediaRoutes,
-                          base::Unretained(this)));
+                          base::Unretained(this), source_id));
   }
 }
 
 void MediaRouterMojoImpl::RegisterIssuesObserver(IssuesObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   issue_manager_.RegisterObserver(observer);
 }
 
 void MediaRouterMojoImpl::UnregisterIssuesObserver(IssuesObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 241 matching lines @@
   if (!sinks_query || !sinks_query->is_active ||
       sinks_query->observers.might_have_observers()) {
     return;
   }
 
   DVLOG_WITH_INSTANCE(1) << "MRPM.StopObservingMediaSinks: " << source_id;
   media_route_provider_->StopObservingMediaSinks(source_id);
   sinks_queries_.erase(source_id);
 }
 
-void MediaRouterMojoImpl::DoStartObservingMediaRoutes() {
+void MediaRouterMojoImpl::DoStartObservingMediaRoutes(
+    const MediaSource::Id& source_id) {
   DVLOG_WITH_INSTANCE(1) << "DoStartObservingMediaRoutes";
-  media_route_provider_->StartObservingMediaRoutes();
+
+  // No need to call MRPM if all observers have been removed in the meantime.
+  auto* routes_query = routes_queries_.get(source_id);
+  if (!routes_query || !routes_query->observers.might_have_observers()) {
+    return;
+  }
+
+  DVLOG_WITH_INSTANCE(1) << "MRPM.StartObservingMediaRoutes: " << source_id;
+  media_route_provider_->StartObservingMediaRoutes(source_id);
+  routes_query->is_active = true;
 }
 
-void MediaRouterMojoImpl::DoStopObservingMediaRoutes() {
+void MediaRouterMojoImpl::DoStopObservingMediaRoutes(
+    const MediaSource::Id& source_id) {
   DVLOG_WITH_INSTANCE(1) << "DoStopObservingMediaRoutes";
-  media_route_provider_->StopObservingMediaRoutes();
+
+  auto* routes_query = routes_queries_.get(source_id);
+  // No need to call MRPM if observers have been added in the meantime,
+  // or StopObservingMediaSinks has already been called.
+  if (!routes_query || !routes_query->is_active ||
+      routes_query->observers.might_have_observers()) {
+    return;
+  }
+
+  DVLOG_WITH_INSTANCE(1) << "MRPM.StopObservingMediaRoutes: " << source_id;
+  media_route_provider_->StopObservingMediaRoutes(source_id);
+  routes_queries_.erase(source_id);
 }
 
 void MediaRouterMojoImpl::EnqueueTask(const base::Closure& closure) {
   pending_requests_.push_back(closure);
   if (pending_requests_.size() > kMaxPendingRequests) {
     DLOG_WITH_INSTANCE(ERROR) << "Reached max queue size. Dropping oldest "
                               << "request.";
     pending_requests_.pop_front();
   }
   DVLOG_WITH_INSTANCE(2) << "EnqueueTask (queue-length="
@@ skipping 68 matching lines @@
 }
 
 void MediaRouterMojoImpl::DrainPendingRequests() {
   DLOG_WITH_INSTANCE(ERROR)
       << "Draining request queue. (queue-length=" << pending_requests_.size()
       << ")";
   pending_requests_.clear();
 }
 
 }  // namespace media_router