[Media Router] Add a presentation id to MediaRoute mapping in the MR

chrome/browser/media/router/media_router_base.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_base.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace media_router {
 
 // A MediaRoutesObserver that maintains state about the current set of media
 // routes.
 class MediaRouterBase::InternalMediaRoutesObserver
     : public MediaRoutesObserver {
  public:
   explicit InternalMediaRoutesObserver(MediaRouter* router)
       : MediaRoutesObserver(router), has_route(false) {}
   ~InternalMediaRoutesObserver() override {}
 
   // MediaRoutesObserver
   void OnRoutesUpdated(
       const std::vector<MediaRoute>& routes,
       const std::vector<MediaRoute::Id>& joinable_route_ids) override {
+    std::vector<MediaRoute> old_routes = std::move(current_routes);
     current_routes = routes;
+
+    // Restore presentation id from old route.
+    for (auto& route : current_routes) {
+      if (route.presentation_id().has_value())
+        continue;
+
+      auto old_route_it = std::find_if(old_routes.begin(), old_routes.end(),
+                                       [&route](const MediaRoute& old_route) {
+                                         return route.media_route_id() ==
+                                                old_route.media_route_id();
+                                       });
+
+      if (old_route_it == old_routes.end())
+        continue;
+
+      if (old_route_it->presentation_id().has_value())
+        route.set_presentation_id(old_route_it->presentation_id().value());
+    }
+
     incognito_route_ids.clear();
     // TODO(crbug.com/611486): Have the MRPM pass a list of joinable route ids
     // via |joinable_route_ids|, and check here if it is non-empty.
     has_route = !routes.empty();
     for (const auto& route : routes) {
       if (route.is_incognito())
         incognito_route_ids.push_back(route.media_route_id());
     }
   }
 
+  const MediaRoute* GetPresentationRoute(
+      const std::string& presentation_id) const {
+    for (const auto& route : current_routes) {
+      if (route.presentation_id().has_value() &&
+          route.presentation_id().value() == presentation_id)
+        return &route;
+    }
+
+    return nullptr;
+  }
+
+  void SetPresentationId(const MediaRoute::Id& route_id,

[mark a. foltz, 2017/03/13 17:52:11]

Can the presentation ID just be set on the Route in
RouteRequestResult::FromSuccess?

+                         const std::string& presentation_id) {
+    auto route_it = std::find_if(current_routes.begin(), current_routes.end(),
+                                 [&route_id](const MediaRoute& route) {
+                                   return route.media_route_id() == route_id;
+                                 });
+
+    if (route_it == current_routes.end())
+      return;
+
+    route_it->set_presentation_id(presentation_id);
+  }
+
   bool has_route;
   std::vector<MediaRoute> current_routes;
   std::vector<MediaRoute::Id> incognito_route_ids;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InternalMediaRoutesObserver);
 };
 
 MediaRouterBase::~MediaRouterBase() {
   CHECK(!internal_routes_observer_);
@@ skipping 18 matching lines @@
 
 void MediaRouterBase::OnIncognitoProfileShutdown() {
   for (const auto& route_id : internal_routes_observer_->incognito_route_ids)
     TerminateRoute(route_id);
 }
 
 std::vector<MediaRoute> MediaRouterBase::GetCurrentRoutes() const {
   return internal_routes_observer_->current_routes;
 }
 
+const MediaRoute* MediaRouterBase::GetPresentationRoute(
+    const std::string& presentation_id) const {
+  DCHECK(internal_routes_observer_);
+  return internal_routes_observer_->GetPresentationRoute(presentation_id);
+}
+
+void MediaRouterBase::SetPresentationId(const MediaRoute::Id& route_id,
+                                        const std::string& presentation_id) {
+  DCHECK(internal_routes_observer_);
+  return internal_routes_observer_->SetPresentationId(route_id,
+                                                      presentation_id);
+}
+
 MediaRouterBase::MediaRouterBase() : initialized_(false) {}
 
 // static
 std::string MediaRouterBase::CreatePresentationId() {
   return "mr_" + base::GenerateGUID();
 }
 
 void MediaRouterBase::NotifyPresentationConnectionStateChange(
     const MediaRoute::Id& route_id,
     content::PresentationConnectionState state) {
@@ skipping 43 matching lines @@
   }
 }
 
 void MediaRouterBase::Shutdown() {
   // The observer calls virtual methods on MediaRouter; it must be destroyed
   // outside of the dtor
   internal_routes_observer_.reset();
 }
 
 }  // namespace media_router