[Media Router] Clean up issues related code.

chrome/browser/ui/toolbar/media_router_action_unittest.cc

Index: chrome/browser/ui/toolbar/media_router_action_unittest.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
index c85cc323c6de45853534bde100ccc7d0122ee06b..6040eade26819d52c0121ac28e06ff3df977dd7a 100644
--- a/chrome/browser/ui/toolbar/media_router_action_unittest.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
@@ -81,34 +81,18 @@ class MediaRouterActionUnitTest : public MediaRouterWebUITest {
   MediaRouterActionUnitTest()
       : MediaRouterWebUITest(true),
         toolbar_model_(nullptr),
-        fake_issue_notification_(media_router::Issue(
+        fake_issue_notification_(media_router::IssueInfo(
             "title notification",
-            "message notification",
-            media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS),
-            std::vector<media_router::IssueAction>(),
-            "route_id",
-            media_router::Issue::NOTIFICATION,
-            false,
-            -1)),
-        fake_issue_warning_(
-            media_router::Issue("title warning",
-                                "message warning",
-                                media_router::IssueAction(
-                                    media_router::IssueAction::TYPE_LEARN_MORE),
-                                std::vector<media_router::IssueAction>(),
-                                "route_id",
-                                media_router::Issue::WARNING,
-                                false,
-                                12345)),
-        fake_issue_fatal_(media_router::Issue(
-            "title fatal",
-            "message fatal",
-            media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS),
-            std::vector<media_router::IssueAction>(),
-            "route_id",
-            media_router::Issue::FATAL,
-            true,
-            -1)),
+            media_router::IssueInfo::Action::DISMISS,
+            media_router::IssueInfo::Severity::NOTIFICATION)),
+        fake_issue_warning_(media_router::IssueInfo(
+            "title warning",
+            media_router::IssueInfo::Action::LEARN_MORE,
+            media_router::IssueInfo::Severity::WARNING)),
+        fake_issue_fatal_(
+            media_router::IssueInfo("title fatal",
+                                    media_router::IssueInfo::Action::DISMISS,
+                                    media_router::IssueInfo::Severity::FATAL)),
         fake_source1_("fakeSource1"),
         fake_source2_("fakeSource2"),
         active_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE)),
@@ -157,15 +141,13 @@ class MediaRouterActionUnitTest : public MediaRouterWebUITest {
   }
 
   TestMediaRouterAction* action() { return action_.get(); }
-  const media_router::Issue* fake_issue_notification() {
-    return &fake_issue_notification_;
+  const media_router::Issue& fake_issue_notification() {
+    return fake_issue_notification_;
   }
-  const media_router::Issue* fake_issue_warning() {
-    return &fake_issue_warning_;
-  }
-  const media_router::Issue* fake_issue_fatal() {
-    return &fake_issue_fatal_;
+  const media_router::Issue& fake_issue_warning() {
+    return fake_issue_warning_;
   }
+  const media_router::Issue& fake_issue_fatal() { return fake_issue_fatal_; }
   const gfx::Image active_icon() { return active_icon_; }
   const gfx::Image error_icon() { return error_icon_; }
   const gfx::Image idle_icon() { return idle_icon_; }
@@ -230,22 +212,22 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssues) {
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Don't update |current_icon_| since the issue is only a notification.
-  action()->OnIssueUpdated(fake_issue_notification());
+  action()->OnIssue(fake_issue_notification());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| since the issue is a warning.
-  action()->OnIssueUpdated(fake_issue_warning());
+  action()->OnIssue(fake_issue_warning());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       warning_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| since the issue is fatal.
-  action()->OnIssueUpdated(fake_issue_fatal());
+  action()->OnIssue(fake_issue_fatal());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       error_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Clear the issue.
-  action()->OnIssueUpdated(nullptr);
+  action()->OnIssuesCleared();
   EXPECT_TRUE(gfx::test::AreImagesEqual(idle_icon(),
                                  action()->GetIcon(nullptr, gfx::Size())));
 }
@@ -282,7 +264,7 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
 
   // There is no change in |current_icon_| since notification issues do not
   // update the state.
-  action()->OnIssueUpdated(fake_issue_notification());
+  action()->OnIssue(fake_issue_notification());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
@@ -299,7 +281,7 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
 
   // Update |current_icon_|, with a priority to reflect the warning issue
   // rather than the local route.
-  action()->OnIssueUpdated(fake_issue_warning());
+  action()->OnIssue(fake_issue_warning());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       warning_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
@@ -310,7 +292,7 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
       warning_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| since the issue has been updated to fatal.
-  action()->OnIssueUpdated(fake_issue_fatal());
+  action()->OnIssue(fake_issue_fatal());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       error_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
@@ -321,7 +303,7 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
 
   // When the fatal issue is dismissed, |current_icon_| reflects the existing
   // local route.
-  action()->OnIssueUpdated(nullptr);
+  action()->OnIssuesCleared();
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       active_icon(), action()->GetIcon(nullptr, gfx::Size())));