[PresentationAPI] Implements send API for Blob data from WebPresentationClient

content/browser/presentation/presentation_service_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 "content/browser/presentation/presentation_service_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "content/browser/presentation/presentation_type_converters.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/presentation_session_message.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/presentation_constants.h"
 
 namespace content {
 
 namespace {
 
+using presentation::PresentationMessageType;

[jochen (gone - plz use gerrit), 2015/06/09 08:29:06]

please don't use "using" other for helping for large-scale refactoring

[USE s.singapati at gmail.com, 2015/06/09 09:07:18]

Acknowledged. Yes this is a small change from PS#3 to #4 to only avoid long enum
values. Can we proceed with this?

[USE s.singapati at gmail.com, 2015/06/09 14:12:17]

Done.

+
 const int kInvalidRequestSessionId = -1;
 
 int GetNextRequestSessionId() {
   static int next_request_session_id = 0;
   return ++next_request_session_id;
 }
 
 // The return value takes ownership of the contents of |input|.
 presentation::SessionMessagePtr ToMojoSessionMessage(
     content::PresentationSessionMessage* input) {
   presentation::SessionMessagePtr output(presentation::SessionMessage::New());
   output->presentation_url.Swap(&input->presentation_url);
   output->presentation_id.Swap(&input->presentation_id);
   if (input->is_binary()) {
     // binary data
-    output->type = presentation::PresentationMessageType::
-        PRESENTATION_MESSAGE_TYPE_ARRAY_BUFFER;
+    output->type =
+        PresentationMessageType::PRESENTATION_MESSAGE_TYPE_ARRAY_BUFFER;
     output->data.Swap(input->data.get());
   } else {
     // string message
-    output->type =
-        presentation::PresentationMessageType::PRESENTATION_MESSAGE_TYPE_TEXT;
+    output->type = PresentationMessageType::PRESENTATION_MESSAGE_TYPE_TEXT;
     output->message.Swap(input->message.get());
   }
   return output.Pass();
 }
 
 scoped_ptr<content::PresentationSessionMessage> GetPresentationSessionMessage(
     presentation::SessionMessagePtr input) {
   DCHECK(!input.is_null());
   scoped_ptr<content::PresentationSessionMessage> output;
-  if (input->type == presentation::PresentationMessageType::
-                     PRESENTATION_MESSAGE_TYPE_TEXT) {
-    DCHECK(!input->message.is_null());
-    DCHECK(input->data.is_null());
-    // Return null PresentationSessionMessage if size exceeds.
-    if (input->message.size() > content::kMaxPresentationSessionMessageSize)
+  switch (input->type) {
+    case PresentationMessageType::PRESENTATION_MESSAGE_TYPE_TEXT: {
+      DCHECK(!input->message.is_null());
+      DCHECK(input->data.is_null());
+      // Return null PresentationSessionMessage if size exceeds.
+      if (input->message.size() > content::kMaxPresentationSessionMessageSize)
+        return output.Pass();
+
+      output = content::PresentationSessionMessage::CreateStringMessage(
+          input->presentation_url, input->presentation_id,
+          make_scoped_ptr(new std::string));
+      input->message.Swap(output->message.get());
       return output.Pass();
+    }
+    case PresentationMessageType::PRESENTATION_MESSAGE_TYPE_ARRAY_BUFFER: {
+      DCHECK(!input->data.is_null());
+      DCHECK(input->message.is_null());
+      if (input->data.size() > content::kMaxPresentationSessionMessageSize)
+        return output.Pass();
 
-    output = content::PresentationSessionMessage::CreateStringMessage(
-        input->presentation_url,
-        input->presentation_id,
-        make_scoped_ptr(new std::string));
-    input->message.Swap(output->message.get());
+      output = content::PresentationSessionMessage::CreateArrayBufferMessage(
+          input->presentation_url, input->presentation_id,
+          make_scoped_ptr(new std::vector<uint8_t>));
+      input->data.Swap(output->data.get());
+      return output.Pass();
+    }
+    case PresentationMessageType::PRESENTATION_MESSAGE_TYPE_BLOB: {
+      DCHECK(!input->data.is_null());
+      DCHECK(input->message.is_null());
+      if (input->data.size() > content::kMaxPresentationSessionMessageSize)
+        return output.Pass();
 
-  } else if (input->type == presentation::PresentationMessageType::
-              PRESENTATION_MESSAGE_TYPE_ARRAY_BUFFER) {
-    DCHECK(!input->data.is_null());
-    DCHECK(input->message.is_null());
-    // Return null PresentationSessionMessage if size exceeds.
-    if (input->data.size() > content::kMaxPresentationSessionMessageSize)
+      output = content::PresentationSessionMessage::CreateBlobMessage(
+          input->presentation_url, input->presentation_id,
+          make_scoped_ptr(new std::vector<uint8_t>));
+      input->data.Swap(output->data.get());
       return output.Pass();
-
-    output = content::PresentationSessionMessage::CreateBinaryMessage(
-        input->presentation_url,
-        input->presentation_id,
-        make_scoped_ptr(new std::vector<uint8_t>));
-    input->data.Swap(output->data.get());
+    }
   }
 
+  NOTREACHED() << "Invalid presentation message type " << input->type;
   return output.Pass();
 }
 
 void InvokeNewSessionMojoCallbackWithError(
     const NewSessionMojoCallback& callback) {
   callback.Run(
         presentation::PresentationSessionInfoPtr(),
         presentation::PresentationError::From(
             PresentationError(PRESENTATION_ERROR_UNKNOWN, "Internal error")));
 }
@@ skipping 570 matching lines @@
 void PresentationServiceImpl::DefaultSessionStartContext::Reset() {
   ScopedVector<DefaultSessionMojoCallback> callbacks;
   callbacks.swap(callbacks_);
   for (const auto& callback : callbacks)
     callback->Run(presentation::PresentationSessionInfoPtr());
   session_.reset();
 }
 
 }  // namespace content