Gets presentation ID from route ID upon route creation, and overrides previous presentation ID with…

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 b46c3f11e7cb7ed050ce776adb629eaf48912302..d49c6f1c36fb13b74b5310bc8a68fd5255499e4d 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc
@@ -623,8 +623,16 @@ void PresentationServiceDelegateImpl::ListenForSessionMessages(
     int render_process_id,
     int render_frame_id,
     const PresentationSessionMessageCallback& message_cb) {
-  // BUG=464205
-  NOTIMPLEMENTED();
+  const std::vector<MediaRoute::Id>& route_ids = frame_manager_->GetRouteIds(
+      RenderFrameHostId(render_process_id, render_frame_id));
+  if (route_ids.empty()) {
+    DVLOG(1) << "No media routes found";
+    message_cb.Run(
+        scoped_ptr<ScopedVector<content::PresentationSessionMessage>>());
+    return;
+  }
+
+  router_->ListenForRouteMessages(route_ids, message_cb);
 }
 
 void PresentationServiceDelegateImpl::SendMessage(
@@ -632,8 +640,21 @@ void PresentationServiceDelegateImpl::SendMessage(
     int render_frame_id,
     scoped_ptr<content::PresentationSessionMessage> message_request,
     const SendMessageCallback& send_message_cb) {
-  // BUG=464205
-  NOTIMPLEMENTED();
+  if (message_request->is_binary()) {
+    NOTIMPLEMENTED();
+    send_message_cb.Run(false);
+    return;
+  }
+  const MediaRoute::Id& route_id = frame_manager_->GetRouteId(
+      RenderFrameHostId(render_process_id, render_frame_id),
+      message_request->presentation_id);
+  if (route_id.empty()) {
+    DVLOG(1) << "No active route for  " << message_request->presentation_id;
+    send_message_cb.Run(false);
+    return;
+  }
+  router_->SendRouteMessage(route_id, *(message_request->message),
+                            send_message_cb);
 }
 
 void PresentationServiceDelegateImpl::OnRouteCreated(const MediaRoute& route) {
@@ -645,9 +666,8 @@ void PresentationServiceDelegateImpl::OnRouteCreated(const MediaRoute& route) {
   if (!main_frame)
     return;
   RenderFrameHostId render_frame_host_id(GetRenderFrameHostId(main_frame));
-  // TODO(imcheng): Pass in valid default presentation ID once it is
-  // available from MediaRoute URN. BUG=493365
-  std::string presentation_id;
+  std::string presentation_id =
+      GetPresentationIdAndUrl(route.media_route_id()).first;
   frame_manager_->OnPresentationSessionStarted(
       render_frame_host_id, true,
       content::PresentationSessionInfo(PresentationUrlFromMediaSource(source),