[Presentation API] (5th) (1-UA) integrate controller and receiver side for 1-UA messaging

chrome/browser/media/router/presentation_service_delegate_impl.cc

Index: chrome/browser/media/router/presentation_service_delegate_impl.cc
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.cc b/chrome/browser/media/router/presentation_service_delegate_impl.cc
index 59e441a9ffb9a75dd0ddd9d2672d7bee415f6a40..a92786664e8e697c781e0639d7a7238a9b507a57 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc
@@ -13,6 +13,7 @@
 #include "base/guid.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
+#include "chrome/browser/media/router/browser_presentation_connection_proxy.h"
 #include "chrome/browser/media/router/create_presentation_connection_request.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/media_router.h"
@@ -164,11 +165,16 @@ class PresentationFrame {
     delegate_observer_ = observer;
   }
 
+  bool IsOffscreenPresentation(const std::string& presentation_id);
+  void OnBrowserConnectionAvailable(
+      const content::PresentationSessionInfo& session,
+      content::PresentationConnectionPtr source_conn,

[mark a. foltz, 2017/01/23 22:29:34]

source_connection

[zhaobin, 2017/01/24 19:28:46]

Done.

+      content::PresentationConnectionRequest target_conn_request);

[mark a. foltz, 2017/01/23 22:29:34]

target_connection_request

[zhaobin, 2017/01/24 19:28:46]

Done.

+
  private:
   MediaSource GetMediaSourceFromListener(
       content::PresentationScreenAvailabilityListener* listener) const;
-  base::SmallMap<std::map<std::string, MediaRoute::Id>>
-      presentation_id_to_route_id_;
+  base::SmallMap<std::map<std::string, MediaRoute>> presentation_id_to_route_;
   base::SmallMap<
       std::map<std::string, std::unique_ptr<PresentationMediaSinksObserver>>>
       url_to_sinks_observer_;
@@ -180,6 +186,8 @@ class PresentationFrame {
       MediaRoute::Id,
       std::unique_ptr<PresentationSessionMessagesObserver>>
       session_messages_observers_;
+  std::set<std::unique_ptr<BrowserPresentationConnectionProxy>>
+      browser_connection_proxies_;
 
   RenderFrameHostId render_frame_host_id_;
 
@@ -207,20 +215,21 @@ PresentationFrame::~PresentationFrame() {
 void PresentationFrame::OnPresentationSessionStarted(
     const content::PresentationSessionInfo& session,
     const MediaRoute& route) {
-  presentation_id_to_route_id_[session.presentation_id] =
-      route.media_route_id();
+  presentation_id_to_route_.insert(
+      std::make_pair(session.presentation_id, route));
 }
 
 const MediaRoute::Id PresentationFrame::GetRouteId(
     const std::string& presentation_id) const {
-  auto it = presentation_id_to_route_id_.find(presentation_id);
-  return it != presentation_id_to_route_id_.end() ? it->second : "";
+  auto it = presentation_id_to_route_.find(presentation_id);
+  return it != presentation_id_to_route_.end() ? it->second.media_route_id()
+                                               : "";
 }
 
 const std::vector<MediaRoute::Id> PresentationFrame::GetRouteIds() const {
   std::vector<MediaRoute::Id> route_ids;
-  for (const auto& e : presentation_id_to_route_id_)
-    route_ids.push_back(e.second);
+  for (const auto& e : presentation_id_to_route_)
+    route_ids.push_back(e.second.media_route_id());
   return route_ids;
 }
 
@@ -262,10 +271,17 @@ bool PresentationFrame::HasScreenAvailabilityListenerForTest(
 }
 
 void PresentationFrame::Reset() {
-  for (const auto& pid_route_id : presentation_id_to_route_id_)
-    router_->DetachRoute(pid_route_id.second);
+  auto offscreen_presentation_manager =
+      OffscreenPresentationManagerFactory::GetOrCreateForWebContents(
+          web_contents_);
+
+  for (const auto& pid_route : presentation_id_to_route_) {
+    offscreen_presentation_manager->UnregisterOffscreenPresentationController(
+        pid_route.first, render_frame_host_id_);
+    router_->DetachRoute(pid_route.second.media_route_id());
+  }
 
-  presentation_id_to_route_id_.clear();
+  presentation_id_to_route_.clear();
   url_to_sinks_observer_.clear();
   connection_state_subscriptions_.clear();
   session_messages_observers_.clear();
@@ -274,7 +290,7 @@ void PresentationFrame::Reset() {
 void PresentationFrame::RemoveConnection(const std::string& presentation_id,
                                          const MediaRoute::Id& route_id) {
   // Remove the presentation id mapping so a later call to Reset is a no-op.
-  presentation_id_to_route_id_.erase(presentation_id);
+  presentation_id_to_route_.erase(presentation_id);
 
   // We no longer need to observe route messages.
   session_messages_observers_.erase(route_id);
@@ -287,14 +303,14 @@ void PresentationFrame::ListenForConnectionStateChange(
     const content::PresentationSessionInfo& connection,
     const content::PresentationConnectionStateChangedCallback&
         state_changed_cb) {
-  auto it = presentation_id_to_route_id_.find(connection.presentation_id);
-  if (it == presentation_id_to_route_id_.end()) {
+  auto it = presentation_id_to_route_.find(connection.presentation_id);
+  if (it == presentation_id_to_route_.end()) {
     DLOG(ERROR) << __func__ << "route id not found for presentation: "
                 << connection.presentation_id;
     return;
   }
 
-  const MediaRoute::Id& route_id = it->second;
+  const MediaRoute::Id& route_id = it->second.media_route_id();
   if (connection_state_subscriptions_.find(route_id) !=
       connection_state_subscriptions_.end()) {
     DLOG(ERROR) << __func__
@@ -305,20 +321,26 @@ void PresentationFrame::ListenForConnectionStateChange(
 
   connection_state_subscriptions_.insert(std::make_pair(
       route_id, router_->AddPresentationConnectionStateChangedCallback(
-                    it->second, state_changed_cb)));
+                    route_id, state_changed_cb)));
 }
 
 void PresentationFrame::ListenForSessionMessages(
     const content::PresentationSessionInfo& session,
     const content::PresentationConnectionMessageCallback& message_cb) {
-  auto it = presentation_id_to_route_id_.find(session.presentation_id);
-  if (it == presentation_id_to_route_id_.end()) {
+  auto it = presentation_id_to_route_.find(session.presentation_id);
+  if (it == presentation_id_to_route_.end()) {
     DVLOG(2) << "ListenForSessionMessages: no route for "
              << session.presentation_id;
     return;
   }
 
-  const MediaRoute::Id& route_id = it->second;
+  if (it->second.is_offscreen_presentation()) {
+    DVLOG(2) << "ListenForSessionMessages: do not listen for offscreen "
+             << "presentation [id]: " << session.presentation_id;
+    return;
+  }
+
+  const MediaRoute::Id& route_id = it->second.media_route_id();
   if (session_messages_observers_.find(route_id) !=
       session_messages_observers_.end()) {
     DLOG(ERROR) << __func__
@@ -329,7 +351,7 @@ void PresentationFrame::ListenForSessionMessages(
 
   session_messages_observers_.insert(std::make_pair(
       route_id, base::MakeUnique<PresentationSessionMessagesObserver>(
-          router_, it->second, message_cb)));
+                    router_, route_id, message_cb)));
 }
 
 MediaSource PresentationFrame::GetMediaSourceFromListener(
@@ -340,6 +362,31 @@ MediaSource PresentationFrame::GetMediaSourceFromListener(
              : MediaSourceForPresentationUrl(listener->GetAvailabilityUrl());
 }
 
+bool PresentationFrame::IsOffscreenPresentation(
+    const std::string& presentation_id) {
+  DCHECK(base::ContainsKey(presentation_id_to_route_, presentation_id));
+  auto it = presentation_id_to_route_.find(presentation_id);
+  return it->second.is_offscreen_presentation();
+}
+
+void PresentationFrame::OnBrowserConnectionAvailable(
+    const content::PresentationSessionInfo& session,
+    content::PresentationConnectionPtr source_conn,
+    content::PresentationConnectionRequest target_conn_request) {
+  DCHECK(source_conn);
+  DCHECK(base::ContainsKey(presentation_id_to_route_, session.presentation_id));
+  auto it = presentation_id_to_route_.find(session.presentation_id);
+
+  std::unique_ptr<BrowserPresentationConnectionProxy> proxy =
+      base::MakeUnique<BrowserPresentationConnectionProxy>(session, router_,
+                                                           &it->second);
+
+  proxy->Bind(std::move(target_conn_request));
+  proxy->SetTargetConnection(std::move(source_conn));
+
+  browser_connection_proxies_.insert(std::move(proxy));

[mark a. foltz, 2017/01/23 22:29:34]

Where are entries removed from browser_connection_proxies_?

[zhaobin, 2017/01/24 19:28:46]

Should be removed in PresentationFrame::RemoveConnection() and
PresentationFrame::Reset().

+}
+
 // Used by PresentationServiceDelegateImpl to manage PresentationFrames.
 class PresentationFrameManager {
  public:
@@ -398,6 +445,14 @@ class PresentationFrameManager {
       const content::PresentationSessionInfo& session,
       const MediaRoute& route);
 
+  bool IsOffscreenPresentation(const RenderFrameHostId& render_frame_host_id,
+                               const std::string& presentation_id);
+  void OnBrowserConnectionAvailable(
+      const RenderFrameHostId& render_frame_host_id,
+      const content::PresentationSessionInfo& session,
+      content::PresentationConnectionPtr source_conn,
+      content::PresentationConnectionRequest target_conn_request);
+
   const MediaRoute::Id GetRouteId(const RenderFrameHostId& render_frame_host_id,
                                   const std::string& presentation_id) const;
   const std::vector<MediaRoute::Id> GetRouteIds(
@@ -479,6 +534,26 @@ void PresentationFrameManager::OnDefaultPresentationSessionStarted(
   }
 }
 
+bool PresentationFrameManager::IsOffscreenPresentation(
+    const RenderFrameHostId& render_frame_host_id,
+    const std::string& presentation_id) {
+  const auto it = presentation_frames_.find(render_frame_host_id);
+  if (it != presentation_frames_.end())
+    return it->second->IsOffscreenPresentation(presentation_id);
+  return false;
+}
+
+void PresentationFrameManager::OnBrowserConnectionAvailable(
+    const RenderFrameHostId& render_frame_host_id,
+    const content::PresentationSessionInfo& session,
+    content::PresentationConnectionPtr source_conn,
+    content::PresentationConnectionRequest target_conn_request) {
+  const auto it = presentation_frames_.find(render_frame_host_id);
+  if (it != presentation_frames_.end())

[mark a. foltz, 2017/01/23 22:29:34]

If there is no target presentation frame for the connection, what ensures the
connections are cleaned up?

[zhaobin, 2017/01/24 19:28:46]

Done.

+    return it->second->OnBrowserConnectionAvailable(
+        session, std::move(source_conn), std::move(target_conn_request));
+}
+
 const MediaRoute::Id PresentationFrameManager::GetRouteId(
     const RenderFrameHostId& render_frame_host_id,
     const std::string& presentation_id) const {
@@ -911,20 +986,28 @@ void PresentationServiceDelegateImpl::ListenForConnectionStateChange(
       state_changed_cb);
 }
 
-void PresentationServiceDelegateImpl::ConnectToOffscreenPresentation(
+void PresentationServiceDelegateImpl::ConnectToPresentation(
     int render_process_id,
     int render_frame_id,
     const content::PresentationSessionInfo& session,
     content::PresentationConnectionPtr controller_connection_ptr,
     content::PresentationConnectionRequest receiver_connection_request) {
   RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
-  auto* const offscreen_presentation_manager =
-      OffscreenPresentationManagerFactory::GetOrCreateForWebContents(
-          web_contents_);
-  offscreen_presentation_manager->RegisterOffscreenPresentationController(
-      session.presentation_id, session.presentation_url, render_frame_host_id,
-      std::move(controller_connection_ptr),
-      std::move(receiver_connection_request));
+
+  if (frame_manager_->IsOffscreenPresentation(render_frame_host_id,
+                                              session.presentation_id)) {
+    auto* const offscreen_presentation_manager =
+        OffscreenPresentationManagerFactory::GetOrCreateForWebContents(
+            web_contents_);
+    offscreen_presentation_manager->RegisterOffscreenPresentationController(
+        session.presentation_id, session.presentation_url, render_frame_host_id,
+        std::move(controller_connection_ptr),
+        std::move(receiver_connection_request));
+  } else {
+    frame_manager_->OnBrowserConnectionAvailable(
+        render_frame_host_id, session, std::move(controller_connection_ptr),
+        std::move(receiver_connection_request));
+  }
 }
 
 void PresentationServiceDelegateImpl::OnRouteResponse(