[Media Router] Clean up issues related code.

chrome/browser/ui/toolbar/media_router_action.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 "chrome/browser/ui/toolbar/media_router_action.h"
 
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/issue.h"
 #include "chrome/browser/media/router/media_route.h"
@@ skipping 36 matching lines @@
       toolbar_actions_bar_(toolbar_actions_bar),
       platform_delegate_(MediaRouterActionPlatformDelegate::Create(browser)),
       contextual_menu_(browser),
       tab_strip_model_observer_(this),
       toolbar_actions_bar_observer_(this),
       weak_ptr_factory_(this) {
   DCHECK(browser_);
   DCHECK(toolbar_actions_bar_);
   tab_strip_model_observer_.Add(browser_->tab_strip_model());
   toolbar_actions_bar_observer_.Add(toolbar_actions_bar_);
-  RegisterObserver();
+  IssuesObserver::Init();
 }
 
 MediaRouterAction::~MediaRouterAction() {
-  UnregisterObserver();
 }
 
 // static
 SkColor MediaRouterAction::GetIconColor(gfx::VectorIconId icon_id) {
   switch (icon_id) {
     case gfx::VectorIconId::MEDIA_ROUTER_IDLE:
       return gfx::kChromeIconGrey;
     case gfx::VectorIconId::MEDIA_ROUTER_ACTIVE:
       return gfx::kGoogleBlue500;
     case gfx::VectorIconId::MEDIA_ROUTER_WARNING:
@@ skipping 87 matching lines @@
 
 void MediaRouterAction::UpdateState() {
   delegate_->UpdateState();
 }
 
 bool MediaRouterAction::DisabledClickOpensMenu() const {
   return false;
 }
 
 void MediaRouterAction::OnIssueUpdated(const media_router::Issue* issue) {
-  issue_.reset(issue ? new media_router::Issue(*issue) : nullptr);
+  if (!issue)
+    current_issue_severity_.reset();
+  else
+    current_issue_severity_ = issue->info().severity;
+
   MaybeUpdateIcon();
 }
 
 void MediaRouterAction::OnRoutesUpdated(
     const std::vector<media_router::MediaRoute>& routes,
     const std::vector<media_router::MediaRoute::Id>& joinable_route_ids) {
   has_local_display_route_ =
       std::find_if(routes.begin(), routes.end(),
                    [](const media_router::MediaRoute& route) {
                      return route.is_local() && route.for_display();
@@ skipping 79 matching lines @@
     // Tell the associated view to update its icon to reflect the change made
     // above. If MaybeUpdateIcon() was called as a result of instantiating
     // |this|, then |delegate_| may not be set yet.
     if (delegate_)
       UpdateState();
   }
 }
 
 gfx::VectorIconId MediaRouterAction::GetCurrentIcon() const {
   // Highest priority is to indicate whether there's an issue.
-  if (issue_) {
-    if (issue_->severity() == media_router::Issue::FATAL)
+  if (current_issue_severity_.has_value()) {
+    if (*current_issue_severity_ == media_router::IssueInfo::Severity::FATAL)
       return gfx::VectorIconId::MEDIA_ROUTER_ERROR;
-    if (issue_->severity() == media_router::Issue::WARNING)
+    else if (*current_issue_severity_ ==
+             media_router::IssueInfo::Severity::WARNING)
       return gfx::VectorIconId::MEDIA_ROUTER_WARNING;
+    // Fall through for Severity::NOTIFICATION.
   }
 
   return has_local_display_route_ ? gfx::VectorIconId::MEDIA_ROUTER_ACTIVE
                                   : gfx::VectorIconId::MEDIA_ROUTER_IDLE;
 }