[Media Router] Clean up issues related code.

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 9c344aba897cb0a99d4622ae81287af24a07b163..d735fe7b2d303c0bb7488125ae4528d619f4dc66 100644
--- a/chrome/browser/media/router/mojo/media_router_type_converters.cc
+++ b/chrome/browser/media/router/mojo/media_router_type_converters.cc
@@ -18,6 +18,38 @@ using RouteRequestResultCode = media_router::interfaces::RouteRequestResultCode;
 
 namespace mojo {
 
+namespace {
+
+media_router::Issue::Severity IssueSeverityFromMojo(
+    media_router::interfaces::Issue::Severity severity) {
+  switch (severity) {
+    case media_router::interfaces::Issue::Severity::FATAL:
+      return media_router::Issue::Severity::FATAL;
+    case media_router::interfaces::Issue::Severity::WARNING:
+      return media_router::Issue::Severity::WARNING;
+    case media_router::interfaces::Issue::Severity::NOTIFICATION:
+      return media_router::Issue::Severity::NOTIFICATION;
+    default:
+      NOTREACHED() << "Unknown issue severity " << severity;
+      return media_router::Issue::Severity::WARNING;
+  }
+}
+
+media_router::Issue::ActionType IssueActionTypeFromMojo(
+    media_router::interfaces::Issue::ActionType action_type) {
+  switch (action_type) {
+    case media_router::interfaces::Issue::ActionType::DISMISS:
+      return media_router::Issue::ActionType::DISMISS;
+    case media_router::interfaces::Issue::ActionType::LEARN_MORE:
+      return media_router::Issue::ActionType::LEARN_MORE;
+    default:
+      NOTREACHED() << "Unknown issue action type " << action_type;
+      return media_router::Issue::ActionType::DISMISS;
+  }
+}
+
+}  // namespace
+
 media_router::MediaSink::IconType SinkIconTypeFromMojo(
     media_router::interfaces::MediaSink::IconType type) {
   switch (type) {
@@ -95,50 +127,25 @@ TypeConverter<std::unique_ptr<media_router::MediaRoute>,
   return media_route;
 }
 
-media_router::Issue::Severity IssueSeverityFromMojo(
-    media_router::interfaces::Issue::Severity severity) {
-  switch (severity) {
-    case media_router::interfaces::Issue::Severity::FATAL:
-      return media_router::Issue::FATAL;
-    case media_router::interfaces::Issue::Severity::WARNING:
-      return media_router::Issue::WARNING;
-    case media_router::interfaces::Issue::Severity::NOTIFICATION:
-      return media_router::Issue::NOTIFICATION;
-    default:
-      NOTREACHED() << "Unknown issue severity " << severity;
-      return media_router::Issue::WARNING;
-  }
-}
-
-media_router::IssueAction::Type IssueActionTypeFromMojo(
-    media_router::interfaces::Issue::ActionType action_type) {
-  switch (action_type) {
-    case media_router::interfaces::Issue::ActionType::DISMISS:
-      return media_router::IssueAction::TYPE_DISMISS;
-    case media_router::interfaces::Issue::ActionType::LEARN_MORE:
-      return media_router::IssueAction::TYPE_LEARN_MORE;
-    default:
-      NOTREACHED() << "Unknown issue action type " << action_type;
-      return media_router::IssueAction::TYPE_DISMISS;
-  }
-}
-
 // static
 media_router::Issue TypeConverter<media_router::Issue, IssuePtr>::Convert(
     const IssuePtr& input) {
-  std::vector<media_router::IssueAction> actions;
+  media_router::Issue issue(input->title,
+                            IssueActionTypeFromMojo(input->default_action),
+                            IssueSeverityFromMojo(input->severity));
+  issue.set_message(input->message);
   if (input->secondary_actions) {
+    std::vector<media_router::Issue::ActionType> 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.push_back(IssueActionTypeFromMojo(input->secondary_actions[i]));
     }
+    issue.set_secondary_actions(actions);
   }
-  return media_router::Issue(
-      input->title, input->message,
-      media_router::IssueAction(IssueActionTypeFromMojo(input->default_action)),
-      actions, input->route_id, IssueSeverityFromMojo(input->severity),
-      input->is_blocking, input->help_page_id);
+  issue.set_route_id(input->route_id);
+  issue.set_is_blocking(input->is_blocking);
+  issue.set_help_page_id(input->help_page_id);
+  return issue;
 }
 
 content::PresentationConnectionState PresentationConnectionStateFromMojo(