Migrate upgrade notifications to observer

chrome/browser/ui/toolbar/app_menu_icon_controller.cc

 // Copyright 2014 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/app_menu_icon_controller.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
@@ skipping 53 matching lines @@
 }
 
 }  // namespace
 
 AppMenuIconController::AppMenuIconController(Profile* profile,
                                              Delegate* delegate)
     : profile_(profile), delegate_(delegate) {
   DCHECK(profile_);
   DCHECK(delegate_);
 
-  registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
-                 content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
                  content::Source<Profile>(profile_));
 
+  UpgradeDetector::GetInstance()->AddObserver(this);
+
 #if defined(OS_WIN)
   auto* modules = EnumerateModulesModel::GetInstance();
   modules->AddObserver(this);
   modules->MaybePostScanningTask();
 #endif
 }
 
 AppMenuIconController::~AppMenuIconController() {
+  UpgradeDetector::GetInstance()->RemoveObserver(this);
+
 #if defined(OS_WIN)
   EnumerateModulesModel::GetInstance()->RemoveObserver(this);
 #endif
 }
 
 void AppMenuIconController::UpdateDelegate() {
   if (ShouldShowUpgradeRecommended()) {
     UpgradeDetector::UpgradeNotificationAnnoyanceLevel level =
         UpgradeDetector::GetInstance()->upgrade_notification_stage();
     delegate_->UpdateSeverity(IconType::UPGRADE_NOTIFICATION,
@@ skipping 27 matching lines @@
 
 void AppMenuIconController::OnConflictsAcknowledged() {
   UpdateDelegate();
 }
 #endif
 
 void AppMenuIconController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
+  DCHECK_EQ(chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED, type);
   UpdateDelegate();
 }
+
+void AppMenuIconController::OnUpgradeRecommended() {
+  UpdateDelegate();
+}