[Media Router] Clean up issues related code.

chrome/browser/ui/toolbar/media_router_action_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/macros.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
@@ skipping 63 matching lines @@
 
   MediaRouterDialogControllerImpl* controller_;
   MediaRouterActionPlatformDelegate* platform_delegate_;
 };
 
 class MediaRouterActionUnitTest : public MediaRouterWebUITest {
  public:
   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)),
         error_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR)),
         idle_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE)),
         warning_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING)) {}
 
   ~MediaRouterActionUnitTest() override {}
 
   // MediaRouterWebUITest:
@@ skipping 28 matching lines @@
     browser_action_test_util_.reset();
     MediaRouterWebUITest::TearDown();
   }
 
   gfx::Image GetIcon(gfx::VectorIconId icon_id) {
     return gfx::Image(gfx::CreateVectorIcon(
         icon_id, MediaRouterAction::GetIconColor(icon_id)));
   }
 
   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_warning() {
+    return fake_issue_warning_;
   }
-  const media_router::Issue* fake_issue_fatal() {
-    return &fake_issue_fatal_;
-  }
+  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_; }
   const gfx::Image warning_icon() { return warning_icon_; }
   const std::vector<media_router::MediaRoute>& local_display_route_list()
       const {
     return local_display_route_list_;
   }
   const std::vector<media_router::MediaRoute>& non_local_display_route_list()
       const {
@@ skipping 44 matching lines @@
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 }
 
 // Tests the MediaRouterAction icon based on updates to issues.
 TEST_F(MediaRouterActionUnitTest, UpdateIssues) {
   // Initially, there are no issues.
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       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())));
 }
 
 // Tests the MediaRouterAction state updates based on whether there are local
 // routes.
 TEST_F(MediaRouterActionUnitTest, UpdateRoutes) {
   // Initially, there are no routes.
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
@@ skipping 16 matching lines @@
 }
 
 // Tests the MediaRouterAction icon based on updates to both issues and routes.
 TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
   // Initially, there are no issues or routes.
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // 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())));
 
   // Non-local routes also do not have an effect on |current_icon_|.
   action()->OnRoutesUpdated(non_local_display_route_list(),
                             empty_route_id_list());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| since there is a local route.
   action()->OnRoutesUpdated(local_display_route_list(), empty_route_id_list());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       active_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // 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())));
 
   // Closing a local route makes no difference to |current_icon_|.
   action()->OnRoutesUpdated(non_local_display_route_list(),
                             empty_route_id_list());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       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())));
 
   // Fatal issues still take precedent over local routes.
   action()->OnRoutesUpdated(local_display_route_list(), empty_route_id_list());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       error_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // 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())));
 
   // Update |current_icon_| when the local route is closed.
   action()->OnRoutesUpdated(non_local_display_route_list(),
                             empty_route_id_list());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 }
 
@@ skipping 28 matching lines @@
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   action()->ExecuteAction(true);
   EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog());
 
   EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1);
   dialog_controller->CreateMediaRouterDialog();
 
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   dialog_controller->HideMediaRouterDialog();
 }