[Presentation API] Mojo typemap for content::PresentationConnectionMessage

chrome/browser/media/router/browser_presentation_connection_proxy_unittest.cc

Index: chrome/browser/media/router/browser_presentation_connection_proxy_unittest.cc
diff --git a/chrome/browser/media/router/browser_presentation_connection_proxy_unittest.cc b/chrome/browser/media/router/browser_presentation_connection_proxy_unittest.cc
index c981749aa5bdc1fb031f93d01ca37eb4da43a41c..641cdaf618eb0be59ebf43b362c971ae078dd19f 100644
--- a/chrome/browser/media/router/browser_presentation_connection_proxy_unittest.cc
+++ b/chrome/browser/media/router/browser_presentation_connection_proxy_unittest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/media/router/media_source.h"
 #include "chrome/browser/media/router/media_source_helper.h"
 #include "chrome/browser/media/router/mock_media_router.h"
+#include "content/public/common/presentation_connection_message.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -21,13 +22,13 @@ constexpr char kMediaRouteId[] = "MockRouteId";
 class MockPresentationConnectionProxy
     : public NON_EXPORTED_BASE(blink::mojom::PresentationConnection) {
  public:
-  void OnMessage(blink::mojom::ConnectionMessagePtr message,
-                 const OnMessageCallback& on_message_callback) override {
-    OnMessageRaw(message.get(), on_message_callback);
+  // PresentationConnectionMessage is move-only.
+  void OnMessage(content::PresentationConnectionMessage message,
+                 const OnMessageCallback& cb) {
+    OnMessageInternal(message, cb);
   }
-
-  MOCK_METHOD2(OnMessageRaw,
-               void(const blink::mojom::ConnectionMessage*,
+  MOCK_METHOD2(OnMessageInternal,
+               void(const content::PresentationConnectionMessage&,
                     const OnMessageCallback&));
   MOCK_METHOD1(DidChangeState,
                void(content::PresentationConnectionState state));
@@ -81,15 +82,12 @@ class BrowserPresentationConnectionProxyTest : public ::testing::Test {
 
 TEST_F(BrowserPresentationConnectionProxyTest, TestOnMessageTextMessage) {
   std::string message = "test message";
-  blink::mojom::ConnectionMessagePtr session_message =
-      blink::mojom::ConnectionMessage::New();
-  session_message->type = blink::mojom::PresentationMessageType::TEXT;
-  session_message->message = message;
+  content::PresentationConnectionMessage connection_message(message);
 
   base::MockCallback<base::Callback<void(bool)>> mock_on_message_callback;
   EXPECT_CALL(*mock_router(), SendRouteMessage(kMediaRouteId, message, _));
 
-  browser_connection_proxy()->OnMessage(std::move(session_message),
+  browser_connection_proxy()->OnMessage(std::move(connection_message),
                                         mock_on_message_callback.Get());
 }
 
@@ -98,19 +96,17 @@ TEST_F(BrowserPresentationConnectionProxyTest, TestOnMessageBinaryMessage) {
   expected_data.push_back(42);
   expected_data.push_back(36);
 
-  blink::mojom::ConnectionMessagePtr session_message =
-      blink::mojom::ConnectionMessage::New();
-  session_message->type = blink::mojom::PresentationMessageType::BINARY;
-  session_message->data = expected_data;
+  content::PresentationConnectionMessage connection_message(expected_data);
 
   base::MockCallback<base::Callback<void(bool)>> mock_on_message_callback;
   EXPECT_CALL(*mock_router(), SendRouteBinaryMessageInternal(_, _, _))
-      .WillOnce(::testing::Invoke([&expected_data](
-          const MediaRoute::Id& route_id, std::vector<uint8_t>* data,
-          const BrowserPresentationConnectionProxy::OnMessageCallback&
-              callback) { EXPECT_EQ(expected_data, *data); }));
+      .WillOnce(::testing::Invoke(
+          [&expected_data](
+              const MediaRoute::Id& route_id, std::vector<uint8_t>* data,
+              const BrowserPresentationConnectionProxy::OnMessageCallback&
+                  callback) { EXPECT_EQ(*data, expected_data); }));
 
-  browser_connection_proxy()->OnMessage(std::move(session_message),
+  browser_connection_proxy()->OnMessage(std::move(connection_message),
                                         mock_on_message_callback.Get());
 }