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

chrome/browser/ui/webui/media_router/media_router_ui.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/ui/webui/media_router/media_router_ui.h"
 
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "chrome/browser/media/router/create_presentation_session_request.h"
@@ skipping 21 matching lines @@
 #include "content/public/browser/web_ui_data_source.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 
 namespace media_router {
 
 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());
   }
 }
 
 std::string GetHostFromURL(const GURL& gurl) {
   if (gurl.is_empty())
     return std::string();
   std::string host = gurl.host();
   if (base::StartsWith(host, "www.", base::CompareCase::INSENSITIVE_ASCII))
     host = host.substr(4);
@@ skipping 213 matching lines @@
     handler_->UpdateIssue(issue);
 }
 
 void MediaRouterUI::OnRoutesUpdated(const std::vector<MediaRoute>& routes) {
   routes_ = routes;
   if (ui_initialized_)
     handler_->UpdateRoutes(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)
   if (!route)
     LOG(ERROR) << "MediaRouteResponse returned error: " << error;
   else
     handler_->AddRoute(*route);
 
   has_pending_route_request_ = false;
   requesting_route_for_default_source_ = false;
@@ skipping 64 matching lines @@
 
 std::string MediaRouterUI::GetFrameURLHost() const {
   return GetHostFromURL(frame_url_);
 }
 
 const std::string& MediaRouterUI::GetRouteProviderExtensionId() const {
   return router_->media_route_provider_extension_id();
 }
 
 }  // namespace media_router