Migrate upgrade notifications to observer

chrome/browser/ui/ash/system_tray_client.h

Index: chrome/browser/ui/ash/system_tray_client.h
diff --git a/chrome/browser/ui/ash/system_tray_client.h b/chrome/browser/ui/ash/system_tray_client.h
index 12fa7915e65fff5b834a2a9087ecec2354cfd283..a34391f0a4111faa0c662828aa900938766f16f7 100644
--- a/chrome/browser/ui/ash/system_tray_client.h
+++ b/chrome/browser/ui/ash/system_tray_client.h
@@ -10,8 +10,6 @@
 #include "chrome/browser/chromeos/system/system_clock_observer.h"
 #include "chrome/browser/upgrade_observer.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace ash {
@@ -29,7 +27,6 @@ class WidgetDelegate;
 class SystemTrayClient : public ash::mojom::SystemTrayClient,
                          public chromeos::system::SystemClockObserver,
                          public policy::CloudPolicyStore::Observer,
-                         public content::NotificationObserver,
                          public UpgradeObserver {
  public:
   SystemTrayClient();
@@ -101,20 +98,18 @@ class SystemTrayClient : public ash::mojom::SystemTrayClient,
   // chromeos::system::SystemClockObserver:
   void OnSystemClockChanged(chromeos::system::SystemClock* clock) override;
 
-  // UpgradeObserver:
+  // UpgradeObserver implementation.
   void OnUpdateOverCellularAvailable() override;
 
+  // UpgradeObserver implementation.

[sky, 2017/06/07 23:01:41]

Generally we group overrides, and don't have newlines between them. In other
words remove lines 103 and 104 (see policy::CloudPolicyStore::Observer overrides
below for what I mean)

[weidongg, 2017/06/08 02:28:42]

Done.

+  void OnUpgradeRecommended() override;
+
   // policy::CloudPolicyStore::Observer
   void OnStoreLoaded(policy::CloudPolicyStore* store) override;
   void OnStoreError(policy::CloudPolicyStore* store) override;
 
   void UpdateEnterpriseDomain();
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
   // System tray mojo service in ash.
   ash::mojom::SystemTrayPtr system_tray_;
 
@@ -129,8 +124,6 @@ class SystemTrayClient : public ash::mojom::SystemTrayClient,
   std::string last_enterprise_domain_;
   bool last_active_directory_managed_ = false;
 
-  content::NotificationRegistrar registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(SystemTrayClient);
 };