[Presentation API] Mojo typemap for content::PresentationConnectionMessage

content/renderer/presentation/presentation_dispatcher.h

Index: content/renderer/presentation/presentation_dispatcher.h
diff --git a/content/renderer/presentation/presentation_dispatcher.h b/content/renderer/presentation/presentation_dispatcher.h
index 3ec8da333ff7384e62e9e41fbc8d89f360761aa2..bdc911ef1bb961572d7658050f6fef48016b30df 100644
--- a/content/renderer/presentation/presentation_dispatcher.h
+++ b/content/renderer/presentation/presentation_dispatcher.h
@@ -19,6 +19,7 @@
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "content/common/content_export.h"
+#include "content/public/common/presentation_connection_message.h"
 #include "content/public/common/presentation_session.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -75,13 +76,13 @@ class CONTENT_EXPORT PresentationDispatcher
   struct SendMessageRequest {
     SendMessageRequest(
         const PresentationSessionInfo& session_info,
-        blink::mojom::ConnectionMessagePtr message,
+        PresentationConnectionMessage connection_message,

[imcheng, 2017/02/25 01:08:40]

can this be PresentationConnectionMessage&& ?

[dcheng, 2017/02/25 07:17:27]

Chromium style is to use pass-by-value for move-only types, and use std::move().

[mark a. foltz, 2017/02/27 23:25:15]

Acknowledged.

         const blink::WebPresentationConnectionProxy* connection_proxy);
 
     ~SendMessageRequest();
 
     PresentationSessionInfo session_info;
-    blink::mojom::ConnectionMessagePtr message;
+    PresentationConnectionMessage message;
     // Proxy of Blink connection object |connection| calling connection.send().
     // It does not take ownership of proxy object. Proxy object is owned by
     // Blink connection. Blink connection is destroyed after
@@ -97,7 +98,6 @@ class CONTENT_EXPORT PresentationDispatcher
   static SendMessageRequest* CreateSendBinaryMessageRequest(
       const blink::WebURL& presentationUrl,
       const blink::WebString& presentationId,
-      blink::mojom::PresentationMessageType type,
       const uint8_t* data,
       size_t length,
       const blink::WebPresentationConnectionProxy* connection_proxy);
@@ -158,7 +158,7 @@ class CONTENT_EXPORT PresentationDispatcher
                           const std::string& message) override;
   void OnConnectionMessagesReceived(
       const PresentationSessionInfo& session_info,
-      std::vector<blink::mojom::ConnectionMessagePtr> messages) override;
+      const std::vector<PresentationConnectionMessage>& messages) override;
   void OnDefaultSessionStarted(
       const PresentationSessionInfo& session_info) override;