[MediaRouter] wireup send/receive messages.

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"
@@ skipping 592 matching lines @@
           &PresentationServiceDelegateImpl::OnJoinRouteResponse,
           weak_factory_.GetWeakPtr(), render_process_id, render_frame_id,
           content::PresentationSessionInfo(presentation_url, presentation_id),
           success_cb, error_cb));
 }
 
 void PresentationServiceDelegateImpl::ListenForSessionMessages(
     int render_process_id,
     int render_frame_id,
     const PresentationSessionMessageCallback& message_cb) {
-  // BUG=464205
-  NOTIMPLEMENTED();
+  const auto& route_ids = frame_manager_->GetRouteIds(

[imcheng (use chromium acct), 2015/06/22 21:08:07]

Please spell out the type instead of using auto here.

[haibinlu, 2015/06/22 23:22:40]

Done.

+      RenderFrameHostId(render_process_id, render_frame_id));
+  if (route_ids.size() == 0) {

[imcheng (use chromium acct), 2015/06/22 21:08:07]

nit: if (route_ids.empty())

[haibinlu, 2015/06/22 23:22:40]

Done.

+    DVLOG(1) << "No media routes found";
+    return;

[imcheng (use chromium acct), 2015/06/22 21:08:07]

It looks like the callback need to be invoked in this case. Otherwise, the mojo
callback in PresentationServiceImpl will never get invoked.

[haibinlu, 2015/06/22 23:22:40]

Done.

+  }
+
+  router_->ListenForRouteMessages(route_ids, message_cb);
 }
 
 void PresentationServiceDelegateImpl::SendMessage(
     int render_process_id,
     int render_frame_id,
     scoped_ptr<content::PresentationSessionMessage> message_request,
     const SendMessageCallback& send_message_cb) {
-  // BUG=464205
-  NOTIMPLEMENTED();
+  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) << "Presentation session was already closed: "

[imcheng (use chromium acct), 2015/06/22 21:08:07]

nit: maybe "Presentation session does not exist: " ? See Kevin's comment in the
other CL.

[haibinlu, 2015/06/22 23:22:41]

Done.

+             << message_request->presentation_id;
+    return;

[imcheng (use chromium acct), 2015/06/22 21:08:07]

ditto on invoking the callback in early returns here.

[haibinlu, 2015/06/22 23:22:40]

Done.

+  }
+  if (message_request->is_binary()) {
+    DVLOG(1) << "Binary message is not supported yet.";
+    return;
+  }
+  router_->SendRouteMessage(route_id, *(message_request->message.get()),

[Kevin M, 2015/06/22 22:42:26]

.get() is unnecessary here.

[haibinlu, 2015/06/22 23:22:40]

Done.

+                            send_message_cb);
 }
 
 void PresentationServiceDelegateImpl::OnRouteCreated(const MediaRoute& route) {
   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;
@@ skipping 32 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