[Media Router] Add MediaSink subtypes

chrome/browser/media/router/mojo/media_router_struct_traits.cc

Index: chrome/browser/media/router/mojo/media_router_struct_traits.cc
diff --git a/chrome/browser/media/router/mojo/media_router_struct_traits.cc b/chrome/browser/media/router/mojo/media_router_struct_traits.cc
index d96e3b6dcef05ee5c1b8f1892ce6d97c2e5fbae3..2b4379177c489ed6fc3c0c4031a16d01ccb92ae0 100644
--- a/chrome/browser/media/router/mojo/media_router_struct_traits.cc
+++ b/chrome/browser/media/router/mojo/media_router_struct_traits.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/media/router/mojo/media_router_struct_traits.h"
+#include "url/mojo/url_gurl_struct_traits.h"
 
 namespace mojo {
 
@@ -40,4 +41,113 @@ bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>::
   return true;
 }
 
+// static
+bool StructTraits<
+    media_router::mojom::MediaSinkDataView,
+    media_router::MediaSink>::Read(media_router::mojom::MediaSinkDataView data,
+                                   media_router::MediaSink* out) {
+  media_router::MediaSink::Id id;
+  if (!data.ReadSinkId(&id))
+    return false;
+
+  out->set_sink_id(id);
+
+  std::string name;
+  if (!data.ReadName(&name))
+    return false;
+
+  out->set_name(name);
+
+  base::Optional<std::string> description;
+  if (!data.ReadDescription(&description))
+    return false;
+
+  if (description)
+    out->set_description(*description);
+
+  base::Optional<std::string> domain;
+  if (!data.ReadDomain(&domain))
+    return false;
+
+  if (domain)
+    out->set_domain(*domain);
+
+  media_router::MediaSink::IconType icon_type;
+  if (!data.ReadIconType(&icon_type))
+    return false;
+
+  out->set_icon_type(icon_type);
+
+  return true;
+}
+
+// static
+bool StructTraits<media_router::mojom::TypedMediaSinkDataView,
+                  media_router::TypedMediaSink>::
+    Read(media_router::mojom::TypedMediaSinkDataView data,
+         media_router::TypedMediaSink* out) {
+  media_router::MediaSink sink;
+  if (!data.ReadSink(&sink))
+    return false;
+
+  out->set_sink(sink);
+
+  std::string ip_address;
+  if (!data.ReadIpAddress(&ip_address))
+    return false;
+
+  out->set_ip_address(ip_address);
+
+  base::Optional<std::string> model_name;
+  if (!data.ReadModelName(&model_name))
+    return false;
+
+  if (model_name)
+    out->set_model_name(*model_name);
+
+  media_router::mojom::MediaSinkExtraDataDataView extra_data_data_view;
+  data.GetExtraDataDataView(&extra_data_data_view);
+
+  if (extra_data_data_view.is_null()) {
+    NOTREACHED();

[imcheng, 2017/02/11 01:00:21]

NOTREACHED() not needed anymore?

[zhaobin, 2017/02/14 02:08:49]

Done.

+    return false;
+  } else if (extra_data_data_view.is_dial_media_sink()) {
+    media_router::DialSinkExtraData extra_data;
+    if (!extra_data_data_view.ReadDialMediaSink(&extra_data))
+      return false;
+
+    out->set_dial_sink_extra_data(extra_data);
+  } else if (extra_data_data_view.is_cast_media_sink()) {
+    media_router::CastSinkExtraData extra_data;
+    if (!extra_data_data_view.ReadCastMediaSink(&extra_data))
+      return false;
+
+    out->set_cast_sink_extra_data(extra_data);
+  }
+
+  return true;
+}
+
+// static
+bool StructTraits<media_router::mojom::DialMediaSinkDataView,
+                  media_router::DialSinkExtraData>::
+    Read(media_router::mojom::DialMediaSinkDataView data,
+         media_router::DialSinkExtraData* out) {
+  if (!data.ReadAppUrl(&out->app_url))
+    return false;
+
+  return true;
+}
+
+// static
+bool StructTraits<media_router::mojom::CastMediaSinkDataView,
+                  media_router::CastSinkExtraData>::
+    Read(media_router::mojom::CastMediaSinkDataView data,
+         media_router::CastSinkExtraData* out) {
+  out->capabilities = data.capabilities();
+  out->cast_channel_id = data.cast_channel_id();
+
+  return true;
+}
+
 }  // namespace mojo