[MediaRouter] Replace RouteMessage with PresentationConnectionMessage

chrome/common/media_router/mojo/media_router_struct_traits.h

 // Copyright 2016 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.
 
 #ifndef CHROME_COMMON_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_STRUCT_TRAITS_H_
 #define CHROME_COMMON_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_STRUCT_TRAITS_H_
 
 #include <string>
 
 #include "chrome/common/media_router/discovery/media_sink_internal.h"
@@ skipping 139 matching lines @@
       const media_router::CastSinkExtraData& extra_data) {
     return extra_data.cast_channel_id;
   }
 
   static bool Read(media_router::mojom::CastMediaSinkDataView data,
                    media_router::CastSinkExtraData* out);
 };
 
 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.

         return false;
     }
     return true;
   }
 };
 
 template <>
 struct StructTraits<media_router::mojom::IssueDataView,
                     media_router::IssueInfo> {
   static bool Read(media_router::mojom::IssueDataView data,
@@ skipping 350 matching lines @@
         *output = media_router::RouteRequestResult::CANCELLED;
         return true;
     }
     return false;
   }
 };
 
 }  // namespace mojo
 
 #endif  // CHROME_COMMON_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_STRUCT_TRAITS_H_