Updates SessionMessage to ConnectionMessage.

content/renderer/presentation/presentation_dispatcher.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 "content/renderer/presentation/presentation_dispatcher.h"
 
+#include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/common/presentation_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/renderer/presentation/presentation_connection_client.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
@@ skipping 118 matching lines @@
   // to be destroyed so we transfer its ownership to the mojo callback.
   presentation_service_->JoinSession(
       urls, presentationId.utf8(),
       base::Bind(&PresentationDispatcher::OnSessionCreated,
                  base::Unretained(this), base::Passed(&callback)));
 }
 
 void PresentationDispatcher::sendString(const blink::WebURL& presentationUrl,
                                         const blink::WebString& presentationId,
                                         const blink::WebString& message) {
-  if (message.utf8().size() > kMaxPresentationSessionMessageSize) {
+  if (message.utf8().size() > kMaxPresentationConnectionMessageSize) {
     // TODO(crbug.com/459008): Limit the size of individual messages to 64k
     // for now. Consider throwing DOMException or splitting bigger messages
     // into smaller chunks later.
     LOG(WARNING) << "message size exceeded limit!";
     return;
   }
 
   message_request_queue_.push(base::WrapUnique(
       CreateSendTextMessageRequest(presentationUrl, presentationId, message)));
   // Start processing request if only one in the queue.
   if (message_request_queue_.size() == 1)
     DoSendMessage(message_request_queue_.front().get());
 }
 
 void PresentationDispatcher::sendArrayBuffer(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     const uint8_t* data,
     size_t length) {
   DCHECK(data);
-  if (length > kMaxPresentationSessionMessageSize) {
+  if (length > kMaxPresentationConnectionMessageSize) {
     // TODO(crbug.com/459008): Same as in sendString().
     LOG(WARNING) << "data size exceeded limit!";
     return;
   }
 
   message_request_queue_.push(base::WrapUnique(CreateSendBinaryMessageRequest(
       presentationUrl, presentationId,
-      blink::mojom::PresentationMessageType::ARRAY_BUFFER, data, length)));
+      blink::mojom::PresentationMessageType::BINARY, data, length)));
   // Start processing request if only one in the queue.
   if (message_request_queue_.size() == 1)
     DoSendMessage(message_request_queue_.front().get());
 }
 
 void PresentationDispatcher::sendBlobData(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     const uint8_t* data,
     size_t length) {
   DCHECK(data);
-  if (length > kMaxPresentationSessionMessageSize) {
+  if (length > kMaxPresentationConnectionMessageSize) {
     // TODO(crbug.com/459008): Same as in sendString().
     LOG(WARNING) << "data size exceeded limit!";
     return;
   }
 
   message_request_queue_.push(base::WrapUnique(CreateSendBinaryMessageRequest(
       presentationUrl, presentationId,
-      blink::mojom::PresentationMessageType::BLOB, data, length)));
+      blink::mojom::PresentationMessageType::BINARY, data, length)));
   // Start processing request if only one in the queue.
   if (message_request_queue_.size() == 1)
     DoSendMessage(message_request_queue_.front().get());
 }
 
 void PresentationDispatcher::DoSendMessage(SendMessageRequest* request) {
   ConnectToPresentationServiceIfNeeded();
 
-  presentation_service_->SendSessionMessage(
+  presentation_service_->SendConnectionMessage(
       std::move(request->session_info), std::move(request->message),
       base::Bind(&PresentationDispatcher::HandleSendMessageRequests,
                  base::Unretained(this)));
 }
 
 void PresentationDispatcher::HandleSendMessageRequests(bool success) {
   // In normal cases, message_request_queue_ should not be empty at this point
   // of time, but when DidCommitProvisionalLoad() is invoked before receiving
   // the callback for previous send mojo call, queue would have been emptied.
   if (message_request_queue_.empty())
@@ skipping 155 matching lines @@
   status->availability_callbacks.Clear();
   UpdateListeningState(status);
 }
 
 void PresentationDispatcher::OnDefaultSessionStarted(
     blink::mojom::PresentationSessionInfoPtr session_info) {
   if (!controller_)
     return;
 
   if (!session_info.is_null()) {
-    presentation_service_->ListenForSessionMessages(session_info.Clone());
+    presentation_service_->ListenForConnectionMessages(session_info.Clone());
     controller_->didStartDefaultSession(
         new PresentationConnectionClient(std::move(session_info)));
   }
 }
 
 void PresentationDispatcher::OnSessionCreated(
     std::unique_ptr<blink::WebPresentationConnectionClientCallbacks> callback,
     blink::mojom::PresentationSessionInfoPtr session_info,
     blink::mojom::PresentationErrorPtr error) {
   DCHECK(callback);
   if (!error.is_null()) {
     DCHECK(session_info.is_null());
     callback->onError(blink::WebPresentationError(
         GetWebPresentationErrorTypeFromMojo(error->error_type),
         blink::WebString::fromUTF8(error->message)));
     return;
   }
 
   DCHECK(!session_info.is_null());
-  presentation_service_->ListenForSessionMessages(session_info.Clone());
+  presentation_service_->ListenForConnectionMessages(session_info.Clone());
   callback->onSuccess(
       base::MakeUnique<PresentationConnectionClient>(std::move(session_info)));
 }
 
 void PresentationDispatcher::OnReceiverConnectionAvailable(
     blink::mojom::PresentationSessionInfoPtr session_info) {
   if (receiver_) {
     receiver_->onReceiverConnectionAvailable(
         new PresentationConnectionClient(std::move(session_info)));
   }
@@ skipping 18 matching lines @@
   if (!controller_)
     return;
 
   DCHECK(!connection.is_null());
   controller_->didCloseConnection(
       new PresentationConnectionClient(std::move(connection)),
       GetWebPresentationConnectionCloseReasonFromMojo(reason),
       blink::WebString::fromUTF8(message));
 }
 
-void PresentationDispatcher::OnSessionMessagesReceived(
+void PresentationDispatcher::OnConnectionMessagesReceived(
     blink::mojom::PresentationSessionInfoPtr session_info,
-    std::vector<blink::mojom::SessionMessagePtr> messages) {
+    std::vector<blink::mojom::ConnectionMessagePtr> messages) {
   if (!controller_)
     return;
 
   for (size_t i = 0; i < messages.size(); ++i) {
     // Note: Passing batches of messages to the Blink layer would be more
     // efficient.
     std::unique_ptr<PresentationConnectionClient> session_client(
         new PresentationConnectionClient(session_info->url, session_info->id));
     switch (messages[i]->type) {
       case blink::mojom::PresentationMessageType::TEXT: {
         // TODO(mfoltz): Do we need to DCHECK(messages[i]->message)?
         controller_->didReceiveSessionTextMessage(
             session_client.release(),
             blink::WebString::fromUTF8(messages[i]->message.value()));
         break;
       }
-      case blink::mojom::PresentationMessageType::ARRAY_BUFFER:
-      case blink::mojom::PresentationMessageType::BLOB: {
+      case blink::mojom::PresentationMessageType::BINARY: {
         // TODO(mfoltz): Do we need to DCHECK(messages[i]->data)?
         controller_->didReceiveSessionBinaryMessage(
             session_client.release(), &(messages[i]->data->front()),
             messages[i]->data->size());
         break;
       }
       default: {
         NOTREACHED();
         break;
       }
@@ skipping 22 matching lines @@
     status->listening_state = ListeningState::WAITING;
     presentation_service_->ListenForScreenAvailability(status->url);
   } else {
     status->listening_state = ListeningState::INACTIVE;
     presentation_service_->StopListeningForScreenAvailability(status->url);
   }
 }
 
 PresentationDispatcher::SendMessageRequest::SendMessageRequest(
     blink::mojom::PresentationSessionInfoPtr session_info,
-    blink::mojom::SessionMessagePtr message)
+    blink::mojom::ConnectionMessagePtr message)
     : session_info(std::move(session_info)), message(std::move(message)) {}
 
 PresentationDispatcher::SendMessageRequest::~SendMessageRequest() {}
 
 // static
 PresentationDispatcher::SendMessageRequest*
 PresentationDispatcher::CreateSendTextMessageRequest(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     const blink::WebString& message) {
   blink::mojom::PresentationSessionInfoPtr session_info =
       blink::mojom::PresentationSessionInfo::New();
   session_info->url = presentationUrl;
   session_info->id = presentationId.utf8();
 
-  blink::mojom::SessionMessagePtr session_message =
-      blink::mojom::SessionMessage::New();
+  blink::mojom::ConnectionMessagePtr session_message =
+      blink::mojom::ConnectionMessage::New();
   session_message->type = blink::mojom::PresentationMessageType::TEXT;
   session_message->message = message.utf8();
   return new SendMessageRequest(std::move(session_info),
                                 std::move(session_message));
 }
 
 // static
 PresentationDispatcher::SendMessageRequest*
 PresentationDispatcher::CreateSendBinaryMessageRequest(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     blink::mojom::PresentationMessageType type,
     const uint8_t* data,
     size_t length) {
   blink::mojom::PresentationSessionInfoPtr session_info =
       blink::mojom::PresentationSessionInfo::New();
   session_info->url = presentationUrl;
   session_info->id = presentationId.utf8();
 
-  blink::mojom::SessionMessagePtr session_message =
-      blink::mojom::SessionMessage::New();
+  blink::mojom::ConnectionMessagePtr session_message =
+      blink::mojom::ConnectionMessage::New();
   session_message->type = type;
   session_message->data = std::vector<uint8_t>(data, data + length);
   return new SendMessageRequest(std::move(session_info),
                                 std::move(session_message));
 }
 
 PresentationDispatcher::AvailabilityStatus::AvailabilityStatus(
     const GURL& availability_url)
     : url(availability_url),
       last_known_availability(false),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::AvailabilityStatus::~AvailabilityStatus() {
 }
 
 }  // namespace content