[Presentation API] (browser side) Implement reconnect() for 1-UA mode

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 10dd0d6aea22c73034fece47076eec082be46854..e207cb7bb69f508f121ca3e1f4030f0ce3885956 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc
@@ -156,7 +156,6 @@ class PresentationFrame {
       const MediaRoute& route);
   void OnPresentationServiceDelegateDestroyed() const;
 
-  bool IsOffscreenPresentation(const std::string& presentation_id) const;
   void ConnectToPresentation(
       const content::PresentationSessionInfo& session,
       content::PresentationConnectionPtr controller_connection_ptr,
@@ -254,16 +253,17 @@ bool PresentationFrame::HasScreenAvailabilityListenerForTest(
 }
 
 void PresentationFrame::Reset() {
-  auto* offscreen_presentation_manager =
-      OffscreenPresentationManagerFactory::GetOrCreateForWebContents(
-          web_contents_);
 
   for (const auto& pid_route : presentation_id_to_route_) {
-    if (IsOffscreenPresentation(pid_route.first)) {
+    if (pid_route.second.is_offscreen_presentation()) {
+      auto* offscreen_presentation_manager =
+          OffscreenPresentationManagerFactory::GetOrCreateForWebContents(
+              web_contents_);
       offscreen_presentation_manager->UnregisterOffscreenPresentationController(
           pid_route.first, render_frame_host_id_);
+    } else {
+      router_->DetachRoute(pid_route.second.media_route_id());
     }
-    router_->DetachRoute(pid_route.second.media_route_id());
   }
 
   presentation_id_to_route_.clear();
@@ -349,17 +349,6 @@ MediaSource PresentationFrame::GetMediaSourceFromListener(
              : MediaSourceForPresentationUrl(listener->GetAvailabilityUrl());
 }
 
-bool PresentationFrame::IsOffscreenPresentation(
-    const std::string& presentation_id) const {
-  const auto it = presentation_id_to_route_.find(presentation_id);
-  if (it == presentation_id_to_route_.end()) {
-    DLOG(WARNING) << "No route for [presentation_id]: " << presentation_id;
-    return false;
-  }
-
-  return it->second.is_offscreen_presentation();
-}
-
 void PresentationFrame::ConnectToPresentation(
     const content::PresentationSessionInfo& session,
     content::PresentationConnectionPtr controller_connection_ptr,
@@ -373,14 +362,14 @@ void PresentationFrame::ConnectToPresentation(
     return;
   }
 
-  if (IsOffscreenPresentation(session.presentation_id)) {
-    auto* const offscreen_presentation_manager =
+  if (pid_route_it->second.is_offscreen_presentation()) {
+    auto* 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));
+        std::move(receiver_connection_request), pid_route_it->second);
   } else {
     DVLOG(2)
         << "Creating BrowserPresentationConnectionProxy for [presentation_id]: "
@@ -552,7 +541,8 @@ const MediaRoute::Id PresentationFrameManager::GetRouteId(
     const std::string& presentation_id) const {
   const auto it = presentation_frames_.find(render_frame_host_id);
   return it != presentation_frames_.end()
-      ? it->second->GetRouteId(presentation_id) : MediaRoute::Id();
+             ? it->second->GetRouteId(presentation_id)
+             : MediaRoute::Id();
 }
 
 bool PresentationFrameManager::SetScreenAvailabilityListener(
@@ -884,17 +874,38 @@ void PresentationServiceDelegateImpl::JoinSession(
   }
 #endif  // !defined(OS_ANDROID)
 
-  // TODO(crbug.com/627655): Handle multiple URLs.
-  const GURL& presentation_url = presentation_urls[0];
-  bool incognito = web_contents_->GetBrowserContext()->IsOffTheRecord();
-  std::vector<MediaRouteResponseCallback> route_response_callbacks;
-  route_response_callbacks.push_back(
-      base::Bind(&PresentationServiceDelegateImpl::OnJoinRouteResponse,
-                 weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
-                 presentation_url, presentation_id, success_cb, error_cb));
-  router_->JoinRoute(MediaSourceForPresentationUrl(presentation_url).id(),
-                     presentation_id, origin, web_contents_,
-                     route_response_callbacks, base::TimeDelta(), incognito);
+  auto* offscreen_presentation_manager =
+      OffscreenPresentationManagerFactory::GetOrCreateForWebContents(
+          web_contents_);
+  // Check offscreen presentation across frames.
+  if (offscreen_presentation_manager->IsOffscreenPresentation(
+          presentation_id)) {
+    auto* route = offscreen_presentation_manager->GetRoute(presentation_id);
+    DCHECK(route);

[imcheng, 2017/03/16 01:42:51]

Can this ever be nullptr in a race condition? If so we should return error
instead of DCHECKing / crashing.

[zhaobin, 2017/03/16 18:50:30]

Done.

+
+    if (!base::ContainsValue(presentation_urls, route->media_source().url())) {
+      DVLOG(2) << "Presentation URLs do not match URL of current presentation:"
+               << route->media_source().url();
+      return;
+    }
+
+    auto result = RouteRequestResult::FromSuccess(*route, presentation_id);
+    OnJoinRouteResponse(render_process_id, render_frame_id,
+                        presentation_urls[0], presentation_id, success_cb,
+                        error_cb, *result);
+  } else {
+    // TODO(crbug.com/627655): Handle multiple URLs.
+    const GURL& presentation_url = presentation_urls[0];
+    bool incognito = web_contents_->GetBrowserContext()->IsOffTheRecord();
+    std::vector<MediaRouteResponseCallback> route_response_callbacks;
+    route_response_callbacks.push_back(base::Bind(
+        &PresentationServiceDelegateImpl::OnJoinRouteResponse,
+        weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
+        presentation_url, presentation_id, success_cb, error_cb));
+    router_->JoinRoute(MediaSourceForPresentationUrl(presentation_url).id(),
+                       presentation_id, origin, web_contents_,
+                       route_response_callbacks, base::TimeDelta(), incognito);
+  }
 }
 
 void PresentationServiceDelegateImpl::CloseConnection(
@@ -909,7 +920,17 @@ void PresentationServiceDelegateImpl::CloseConnection(
     return;
   }
 
-  router_->DetachRoute(route_id);
+  auto* offscreen_presentation_manager =
+      OffscreenPresentationManagerFactory::GetOrCreateForWebContents(
+          web_contents_);
+
+  if (offscreen_presentation_manager->IsOffscreenPresentation(
+          presentation_id)) {
+    offscreen_presentation_manager->UnregisterOffscreenPresentationController(
+        presentation_id, rfh_id);
+  } else {
+    router_->DetachRoute(route_id);
+  }
   frame_manager_->RemoveConnection(rfh_id, presentation_id, route_id);
   // TODO(mfoltz): close() should always succeed so there is no need to keep the
   // state_changed_cb around - remove it and fire the ChangeEvent on the