[Presentation API] Change ListenForSessionMessages API to client-style.

chrome/browser/ui/webui/media_router/media_router_ui.cc

Index: chrome/browser/ui/webui/media_router/media_router_ui.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index 3c6feec7375ccb956242f43254b726b89ce02d7f..15b6f15df5eca62375998487d054acb2e4c1cd51 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -39,12 +39,16 @@ namespace {
 void HandleRouteResponseForPresentationApi(
     scoped_ptr<CreatePresentationSessionRequest> presentation_request,
     const MediaRoute* route,
+    const std::string& presentation_id,
     const std::string& error) {
   DCHECK(presentation_request);
   if (!route) {
     presentation_request->MaybeInvokeErrorCallback(
         content::PresentationError(content::PRESENTATION_ERROR_UNKNOWN, error));
   } else {
+    // Presentation ID should not have changed.
+    DCHECK_EQ(presentation_request->presentation_info().presentation_id,
+              presentation_id);
     presentation_request->MaybeInvokeSuccessCallback(route->media_route_id());
   }
 }
@@ -278,6 +282,7 @@ void MediaRouterUI::OnRoutesUpdated(const std::vector<MediaRoute>& routes) {
 }
 
 void MediaRouterUI::OnRouteResponseReceived(const MediaRoute* route,
+                                            const std::string& presentation_id,
                                             const std::string& error) {
   DVLOG(1) << "OnRouteResponseReceived";
   // TODO(imcheng): Display error in UI. (crbug.com/490372)