[Media Router] 2nd take on fix route response callback lifetime in UI.

chrome/browser/media/router/presentation_service_delegate_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/presentation_service_delegate_impl.h"
 
 #include <string>
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/containers/small_map.h"
 #include "base/guid.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/media/router/create_session_request.h"
+#include "chrome/browser/media/router/create_presentation_session_request.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_router_mojo_impl.h"
 #include "chrome/browser/media/router/media_router_mojo_impl_factory.h"
 #include "chrome/browser/media/router/media_sink.h"
 #include "chrome/browser/media/router/media_source_helper.h"
 #include "chrome/browser/media/router/presentation_media_sinks_observer.h"
 #include "chrome/browser/media/router/presentation_session_state_observer.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller.h"
@@ skipping 511 matching lines @@
         OnDefaultMediaSourceChanged(default_source_, default_frame_url_));
   }
 }
 
 void PresentationServiceDelegateImpl::OnJoinRouteResponse(
     int render_process_id,
     int render_frame_id,
     const content::PresentationSessionInfo& session,
     const PresentationSessionSuccessCallback& success_cb,
     const PresentationSessionErrorCallback& error_cb,
-    scoped_ptr<MediaRoute> route,
+    const MediaRoute* route,
     const std::string& error_text) {
-  if (!route.get()) {
+  if (!route) {
     error_cb.Run(content::PresentationError(
         content::PRESENTATION_ERROR_NO_PRESENTATION_FOUND, error_text));
   } else {
     DVLOG(1) << "OnJoinRouteResponse: "
              << "route_id: " << route->media_route_id()
              << ", presentation URL: " << session.presentation_url
              << ", presentation ID: " << session.presentation_id;
     frame_manager_->OnPresentationSessionStarted(
         RenderFrameHostId(render_process_id, render_frame_id), false, session,
         route->media_route_id());
@@ skipping 30 matching lines @@
   }
   RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
 
   // TODO(mlamouri,avayvod): don't use the default presentation id provided by
   // the frame when we implement the new default presentation model.
   std::string presentation_id =
       frame_manager_->GetDefaultPresentationId(render_frame_host_id);
   if (presentation_id.empty())
     presentation_id = base::GenerateGUID();
 
-  scoped_ptr<CreateSessionRequest> context(new CreateSessionRequest(
-      presentation_url, presentation_id,
-      GetLastCommittedURLForFrame(render_frame_host_id),
-      base::Bind(&PresentationServiceDelegateImpl::OnStartSessionSucceeded,
-                 weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
-                 success_cb),
-      error_cb));
+  scoped_ptr<CreatePresentationSessionRequest> context(
+      new CreatePresentationSessionRequest(
+          presentation_url, presentation_id,
+          GetLastCommittedURLForFrame(render_frame_host_id),
+          base::Bind(&PresentationServiceDelegateImpl::OnStartSessionSucceeded,
+                     weak_factory_.GetWeakPtr(), render_process_id,
+                     render_frame_id, success_cb),
+          error_cb));
   // NOTE: Currently this request is ignored if a dialog is already open, e.g.
   // via browser action. In practice, this should rarely happen, but log
   // an error message in case it does.
   MediaRouterDialogController::CreateForWebContents(web_contents_);
   MediaRouterDialogController* controller =
       MediaRouterDialogController::FromWebContents(web_contents_);
 
   if (!controller->ShowMediaRouterDialogForPresentation(context.Pass())) {
     LOG(ERROR) << "Media router dialog already exists. Ignoring StartSession.";
     error_cb.Run(content::PresentationError(content::PRESENTATION_ERROR_UNKNOWN,
                                             "Unable to create dialog."));
     return;
   }
 }
 
 void PresentationServiceDelegateImpl::JoinSession(
     int render_process_id,
     int render_frame_id,
     const std::string& presentation_url,
     const std::string& presentation_id,
     const PresentationSessionSuccessCallback& success_cb,
     const PresentationSessionErrorCallback& error_cb) {
+  std::vector<MediaRouteResponseCallback> route_response_callbacks;
+  route_response_callbacks.push_back(base::Bind(
+      &PresentationServiceDelegateImpl::OnJoinRouteResponse,
+      weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
+      content::PresentationSessionInfo(presentation_url, presentation_id),
+      success_cb, error_cb));
   router_->JoinRoute(
       MediaSourceForPresentationUrl(presentation_url).id(), presentation_id,
       GetLastCommittedURLForFrame(
-          RenderFrameHostId(render_process_id, render_frame_id)).GetOrigin(),
-      SessionTabHelper::IdForTab(web_contents_),
-      base::Bind(
-          &PresentationServiceDelegateImpl::OnJoinRouteResponse,
-          weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
-          content::PresentationSessionInfo(presentation_url, presentation_id),
-          success_cb, error_cb));
+          RenderFrameHostId(render_process_id, render_frame_id))
+          .GetOrigin(),
+      SessionTabHelper::IdForTab(web_contents_), route_response_callbacks);
 }
 
 void PresentationServiceDelegateImpl::CloseSession(
     int render_process_id,
     int render_frame_id,
     const std::string& presentation_id) {
   const MediaRoute::Id& route_id = frame_manager_->GetRouteId(
       RenderFrameHostId(render_process_id, render_frame_id), presentation_id);
   if (route_id.empty()) {
     DVLOG(1) << "No active route for: " << presentation_id;
@@ skipping 41 matching lines @@
 }
 
 void PresentationServiceDelegateImpl::ListenForSessionStateChange(
     int render_process_id,
     int render_frame_id,
     const content::SessionStateChangedCallback& state_changed_cb) {
   frame_manager_->ListenForSessionStateChange(
       RenderFrameHostId(render_process_id, render_frame_id), state_changed_cb);
 }
 
-void PresentationServiceDelegateImpl::OnRouteCreated(const MediaRoute& route) {
-  const MediaSource& source = route.media_source();
+void PresentationServiceDelegateImpl::OnRouteResponse(
+    const MediaRoute* route,
+    const std::string& error) {
+  if (!route)
+    return;
+  const MediaSource& source = route->media_source();
   DCHECK(!source.Empty());
   if (!default_source_.Equals(source))
     return;
   RenderFrameHost* main_frame = web_contents_->GetMainFrame();
   if (!main_frame)
     return;
   RenderFrameHostId render_frame_host_id(GetRenderFrameHostId(main_frame));
   std::string presentation_id =
-      GetPresentationIdAndUrl(route.media_route_id()).first;
+      GetPresentationIdAndUrl(route->media_route_id()).first;
   frame_manager_->OnPresentationSessionStarted(
       render_frame_host_id, true,
       content::PresentationSessionInfo(PresentationUrlFromMediaSource(source),
                                        presentation_id),
-      route.media_route_id());
+      route->media_route_id());
 }
 
 void PresentationServiceDelegateImpl::AddDefaultMediaSourceObserver(
     DefaultMediaSourceObserver* observer) {
   default_media_source_observers_.AddObserver(observer);
 }
 
 void PresentationServiceDelegateImpl::RemoveDefaultMediaSourceObserver(
     DefaultMediaSourceObserver* observer) {
   default_media_source_observers_.RemoveObserver(observer);
@@ skipping 13 matching lines @@
 bool PresentationServiceDelegateImpl::HasScreenAvailabilityListenerForTest(
     int render_process_id,
     int render_frame_id,
     const MediaSource::Id& source_id) const {
   RenderFrameHostId render_frame_host_id(render_process_id, render_frame_id);
   return frame_manager_->HasScreenAvailabilityListenerForTest(
       render_frame_host_id, source_id);
 }
 
 }  // namespace media_router