[MediaRouter] Replace RouteMessage with PresentationConnectionMessage

chrome/common/media_router/mojo/media_router_struct_traits.h

Index: chrome/common/media_router/mojo/media_router_struct_traits.h
diff --git a/chrome/common/media_router/mojo/media_router_struct_traits.h b/chrome/common/media_router/mojo/media_router_struct_traits.h
index 06f0940d3e81a497518100ceb39e4a85d328152f..58e8a342544230a36e4bad3e8e5ba56549fc1f43 100644
--- a/chrome/common/media_router/mojo/media_router_struct_traits.h
+++ b/chrome/common/media_router/mojo/media_router_struct_traits.h
@@ -157,49 +157,45 @@ struct StructTraits<media_router::mojom::CastMediaSinkDataView,
 
 template <>
 struct StructTraits<media_router::mojom::RouteMessageDataView,
-                    media_router::RouteMessage> {
+                    content::PresentationConnectionMessage> {
   static media_router::mojom::RouteMessage::Type type(
-      const media_router::RouteMessage& msg) {
-    switch (msg.type) {
-      case media_router::RouteMessage::TEXT:
-        return media_router::mojom::RouteMessage::Type::TEXT;
-      case media_router::RouteMessage::BINARY:
-        return media_router::mojom::RouteMessage::Type::BINARY;
-    }
+      const content::PresentationConnectionMessage& msg) {
+    if (msg.message)
+      return media_router::mojom::RouteMessage::Type::TEXT;
+    else if (msg.data)
+      return media_router::mojom::RouteMessage::Type::BINARY;
     NOTREACHED();
     return media_router::mojom::RouteMessage::Type::TEXT;
   }
 
   static const base::Optional<std::string>& message(
-      const media_router::RouteMessage& msg) {
-    return msg.text;
+      const content::PresentationConnectionMessage& msg) {
+    return msg.message;
   }
 
   static const base::Optional<std::vector<uint8_t>>& data(
-      const media_router::RouteMessage& msg) {
-    return msg.binary;
+      const content::PresentationConnectionMessage& msg) {
+    return msg.data;
   }
 
   static bool Read(media_router::mojom::RouteMessageDataView data,
-                   media_router::RouteMessage* out) {
+                   content::PresentationConnectionMessage* out) {
     media_router::mojom::RouteMessage::Type type;
     if (!data.ReadType(&type))
       return false;
     switch (type) {
       case media_router::mojom::RouteMessage::Type::TEXT: {
-        out->type = media_router::RouteMessage::TEXT;
         base::Optional<std::string> text;
         if (!data.ReadMessage(&text) || !text)

[dcheng, 2017/07/06 08:18:05]

Here and below, just read directly into out->message and out->data
(respectively).

The deserialized value isn't used on failure anyway, so it's OK to build it
incrementally.

[imcheng, 2017/07/06 20:26:49]

Done.

           return false;
-        out->text = std::move(text);
+        out->message = std::move(text);
         break;
       }
       case media_router::mojom::RouteMessage::Type::BINARY: {
-        out->type = media_router::RouteMessage::BINARY;
         base::Optional<std::vector<uint8_t>> binary;
         if (!data.ReadData(&binary) || !binary)
           return false;
-        out->binary = std::move(binary);
+        out->data = std::move(binary);
         break;
       }
       default:

[dcheng, 2017/07/06 08:18:05]

Also, consider removing default: that way the compiler will warn on new enum
values in the future

[imcheng, 2017/07/06 20:26:49]

Done.