Media Router Mojo: Use new wrapper types.

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

Index: chrome/browser/media/router/mojo/media_router_type_converters.cc
diff --git a/chrome/browser/media/router/mojo/media_router_type_converters.cc b/chrome/browser/media/router/mojo/media_router_type_converters.cc
index 4df37542529382ea583de2061784611fbe7d495d..a152148b12afca30071346b9b28ac6576b64efca 100644
--- a/chrome/browser/media/router/mojo/media_router_type_converters.cc
+++ b/chrome/browser/media/router/mojo/media_router_type_converters.cc
@@ -62,10 +62,10 @@ TypeConverter<media_router::MediaSink, MediaSinkPtr>::Convert(
     const MediaSinkPtr& input) {
   media_router::MediaSink sink(input->sink_id, input->name,
                                SinkIconTypeFromMojo(input->icon_type));
-  if (!input->description.get().empty())
-    sink.set_description(input->description);
-  if (!input->domain.get().empty())
-    sink.set_domain(input->domain);
+  if (input->description && !input->description->empty())
+    sink.set_description(*input->description);
+  if (input->domain && !input->domain->empty())
+    sink.set_domain(*input->domain);
 
   return sink;
 }
@@ -75,9 +75,11 @@ media_router::MediaRoute
 TypeConverter<media_router::MediaRoute, MediaRoutePtr>::Convert(
     const MediaRoutePtr& input) {
   media_router::MediaRoute media_route(
-      input->media_route_id, media_router::MediaSource(input->media_source),
+      input->media_route_id,
+      media_router::MediaSource(input->media_source.value_or(std::string())),

[dcheng, 2016/07/25 02:58:20]

I'm not sure I understand the value of making this optional if we're just going
to transparently map it to the empty string. Why not just make it non-optional?

       input->media_sink_id, input->description, input->is_local,
-      input->custom_controller_path, input->for_display);
+      input->custom_controller_path.value_or(std::string()),
+      input->for_display);
   media_route.set_incognito(input->incognito);
   return media_route;
 }
@@ -88,9 +90,12 @@ TypeConverter<std::unique_ptr<media_router::MediaRoute>,
               MediaRoutePtr>::Convert(const MediaRoutePtr& input) {
   std::unique_ptr<media_router::MediaRoute> media_route(
       new media_router::MediaRoute(
-          input->media_route_id, media_router::MediaSource(input->media_source),
+          input->media_route_id,
+          media_router::MediaSource(
+              input->media_source.value_or(std::string())),
           input->media_sink_id, input->description, input->is_local,
-          input->custom_controller_path, input->for_display));
+          input->custom_controller_path.value_or(std::string()),
+          input->for_display));
   media_route->set_incognito(input->incognito);
   return media_route;
 }
@@ -128,16 +133,15 @@ media_router::Issue TypeConverter<media_router::Issue, IssuePtr>::Convert(
     const IssuePtr& input) {
   std::vector<media_router::IssueAction> actions;
   if (input->secondary_actions) {
-    actions.reserve(input->secondary_actions.size());
-    for (size_t i = 0; i < input->secondary_actions.size(); ++i) {
-      actions.push_back(media_router::IssueAction(
-          IssueActionTypeFromMojo(input->secondary_actions[i])));
-    }
+    actions.reserve(input->secondary_actions->size());
+    for (auto a : *input->secondary_actions)
+      actions.push_back(media_router::IssueAction(IssueActionTypeFromMojo(a)));
   }
   return media_router::Issue(
-      input->title, input->message,
+      input->title, input->message.value_or(std::string()),
       media_router::IssueAction(IssueActionTypeFromMojo(input->default_action)),
-      actions, input->route_id, IssueSeverityFromMojo(input->severity),
+      actions, input->route_id.value_or(std::string()),
+      IssueSeverityFromMojo(input->severity),
       input->is_blocking, input->help_page_id);
 }