arc: Revamp the ArcBridgeService interface

ui/arc/notification/arc_notification_manager.h

 // Copyright 2016 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.
 
 #ifndef UI_ARC_NOTIFICATION_ARC_NOTIFICATION_MANAGER_H_
 #define UI_ARC_NOTIFICATION_ARC_NOTIFICATION_MANAGER_H_
 
 #include <string>
 #include <unordered_map>
 
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service.h"
 #include "components/arc/common/notifications.mojom.h"
+#include "components/arc/instance_holder.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "ui/message_center/message_center.h"
 
 namespace arc {
 
 class ArcNotificationItem;
 
-class ArcNotificationManager : public ArcService,
-                               public ArcBridgeService::Observer,
-                               public mojom::NotificationsHost {
+class ArcNotificationManager
+    : public ArcService,
+      public InstanceHolder<mojom::NotificationsInstance>::Observer,
+      public mojom::NotificationsHost {
  public:
   ArcNotificationManager(ArcBridgeService* bridge_service,
                          const AccountId& main_profile_id);
 
   ArcNotificationManager(ArcBridgeService* bridge_service,
                          const AccountId& main_profile_id,
                          message_center::MessageCenter* message_center);
 
   ~ArcNotificationManager() override;
 
-  // ArcBridgeService::Observer implementation:
-  void OnNotificationsInstanceReady() override;
-  void OnNotificationsInstanceClosed() override;
+  // InstanceHolder<mojom::NotificationsInstance>::Observer implementation:
+  void OnInstanceReady(mojom::NotificationsInstance* notifications_instance,
+                       uint32_t version) override;
+  void OnInstanceClosed(mojom::NotificationsInstance*) override;
 
   // mojom::NotificationsHost implementation:
   void OnNotificationPosted(mojom::ArcNotificationDataPtr data) override;
   void OnNotificationRemoved(const mojo::String& key) override;
   void OnToastPosted(mojom::ArcToastDataPtr data) override;
   void OnToastCancelled(mojom::ArcToastDataPtr data) override;
 
   // Methods called from ArcNotificationItem:
   void SendNotificationRemovedFromChrome(const std::string& key);
   void SendNotificationClickedOnChrome(const std::string& key);
-  void SendNotificationButtonClickedOnChrome(
-      const std::string& key, int button_index);
+  void SendNotificationButtonClickedOnChrome(const std::string& key,
+                                             int button_index);
 
  private:
   const AccountId main_profile_id_;
   message_center::MessageCenter* const message_center_;
 
   using ItemMap =
       std::unordered_map<std::string, std::unique_ptr<ArcNotificationItem>>;
   ItemMap items_;
 
   bool ready_ = false;
 
   mojo::Binding<arc::mojom::NotificationsHost> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcNotificationManager);
 };
 
 }  // namespace arc
 
 #endif  // UI_ARC_NOTIFICATION_ARC_NOTIFICATION_MANAGER_H_