[Media Router] Clean up issues related code.

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

Index: chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc
diff --git a/chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc b/chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc
index 31994662cd6008726809083a04bd0ea83729df87..8dbfd4948a9685d1444393d0f693fbc84aad8459 100644
--- a/chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc
+++ b/chrome/browser/media/router/mojo/media_router_type_converters_unittest.cc
@@ -133,33 +133,32 @@ TEST(MediaRouterTypeConvertersTest, ConvertIssue) {
   mojoIssue->is_blocking = true;
   mojoIssue->help_page_id = 12345;
 
-  std::vector<IssueAction> secondary_actions;
-  secondary_actions.push_back(IssueAction(IssueAction::TYPE_DISMISS));
-  Issue expected_issue(
-      "title", "msg", IssueAction(IssueAction::TYPE_LEARN_MORE),
-      secondary_actions, "routeId", Issue::WARNING, true, 12345);
+  std::vector<Issue::ActionType> secondary_actions;
+  secondary_actions.push_back(Issue::ActionType::DISMISS);
+  Issue expected_issue("title", Issue::ActionType::LEARN_MORE,
+                       Issue::Severity::WARNING);
+  expected_issue.set_message("msg");
+  expected_issue.set_secondary_actions(secondary_actions);
+  expected_issue.set_route_id("routeId");
+  expected_issue.set_is_blocking(true);
+  expected_issue.set_help_page_id(12345);
   Issue converted_issue = mojo::TypeConverter<
       media_router::Issue,
       media_router::interfaces::IssuePtr>::Convert(mojoIssue);
 
   EXPECT_EQ(expected_issue.title(), converted_issue.title());
   EXPECT_EQ(expected_issue.message(), converted_issue.message());
-  EXPECT_EQ(expected_issue.default_action().type(),
-            converted_issue.default_action().type());
-  ASSERT_EQ(expected_issue.secondary_actions().size(),
-            converted_issue.secondary_actions().size());
-  for (size_t i = 0; i < expected_issue.secondary_actions().size(); ++i) {
-    EXPECT_EQ(expected_issue.secondary_actions()[i].type(),
-              converted_issue.secondary_actions()[i].type());
-  }
+  EXPECT_EQ(expected_issue.default_action(), converted_issue.default_action());
+  EXPECT_EQ(expected_issue.secondary_actions(),
+            converted_issue.secondary_actions());
   EXPECT_EQ(expected_issue.route_id(), converted_issue.route_id());
   EXPECT_EQ(expected_issue.severity(), converted_issue.severity());
-  EXPECT_EQ(expected_issue.is_blocking(), converted_issue.is_blocking());
+  EXPECT_EQ(expected_issue.IsBlocking(), converted_issue.IsBlocking());
   EXPECT_EQ(expected_issue.help_page_id(), converted_issue.help_page_id());
 
   // Ensure that the internal Issue objects are considered distinct
   // (they possess different IDs.)
-  EXPECT_FALSE(converted_issue.Equals(expected_issue));
+  EXPECT_NE(expected_issue, converted_issue);
 }
 
 TEST(MediaRouterTypeConvertersTest, ConvertIssueWithoutOptionalFields) {
@@ -170,24 +169,23 @@ TEST(MediaRouterTypeConvertersTest, ConvertIssueWithoutOptionalFields) {
   mojoIssue->severity = interfaces::Issue::Severity::WARNING;
   mojoIssue->is_blocking = true;
 
-  Issue expected_issue("title", "", IssueAction(IssueAction::TYPE_DISMISS),
-                       std::vector<IssueAction>(), "", Issue::WARNING, true,
-                       -1);
+  Issue expected_issue("title", Issue::ActionType::DISMISS,
+                       Issue::Severity::WARNING);
+  expected_issue.set_is_blocking(true);
 
   Issue converted_issue = mojo::TypeConverter<
       media_router::Issue,
       media_router::interfaces::IssuePtr>::Convert(mojoIssue);
 
   EXPECT_EQ(expected_issue.title(), converted_issue.title());
-  EXPECT_EQ(expected_issue.default_action().type(),
-            converted_issue.default_action().type());
+  EXPECT_EQ(expected_issue.default_action(), converted_issue.default_action());
   EXPECT_EQ(0u, converted_issue.secondary_actions().size());
   EXPECT_EQ(expected_issue.severity(), converted_issue.severity());
-  EXPECT_EQ(expected_issue.is_blocking(), converted_issue.is_blocking());
+  EXPECT_EQ(expected_issue.IsBlocking(), converted_issue.IsBlocking());
 
   // Ensure that the internal Issue objects are considered distinct
   // (they possess different IDs.)
-  EXPECT_FALSE(converted_issue.Equals(expected_issue));
+  EXPECT_NE(expected_issue, converted_issue);
 }
 
 }  // namespace media_router