arc: Revamp the ArcBridgeService interface

ui/arc/notification/arc_notification_manager_unittest.cc

 // 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.
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "components/arc/instance_holder.h"
 #include "components/arc/test/fake_arc_bridge_instance.h"
 #include "components/arc/test/fake_arc_bridge_service.h"
 #include "components/arc/test/fake_notifications_instance.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/arc/notification/arc_notification_manager.h"
 #include "ui/message_center/fake_message_center.h"
 
 namespace arc {
 
 namespace {
@@ skipping 28 matching lines @@
   GetVisibleNotifications() override {
     return visible_notifications_;
   }
 
  private:
   message_center::NotificationList::Notifications visible_notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMessageCenter);
 };
 
-class ArcBridgeServiceObserver : public ArcBridgeService::Observer {
+class NotificationsObserver
+    : public InstanceHolder<mojom::NotificationsInstance>::Observer {
  public:
-  ArcBridgeServiceObserver() = default;
-  void OnNotificationsInstanceReady() override { ready_ = true; }
+  NotificationsObserver() = default;
+  void OnInstanceReady(mojom::NotificationsInstance*,
+                       uint32_t version) override {
+    ready_ = true;
+  }
 
   bool IsReady() { return ready_; }
 
  private:
   bool ready_ = false;
 
-  DISALLOW_COPY_AND_ASSIGN(ArcBridgeServiceObserver);
+  DISALLOW_COPY_AND_ASSIGN(NotificationsObserver);
 };
 
 }  // anonymous namespace
 
 class ArcNotificationManagerTest : public testing::Test {
  public:
   ArcNotificationManagerTest() {}
   ~ArcNotificationManagerTest() override { loop_.RunUntilIdle(); }
 
  protected:
@@ skipping 34 matching lines @@
   void SetUp() override {
     mojom::NotificationsInstancePtr arc_notifications_instance;
     arc_notifications_instance_.reset(
         new FakeNotificationsInstance(GetProxy(&arc_notifications_instance)));
     service_.reset(new FakeArcBridgeService());
     message_center_.reset(new MockMessageCenter());
 
     arc_notification_manager_.reset(new ArcNotificationManager(
         service(), EmptyAccountId(), message_center_.get()));
 
-    ArcBridgeServiceObserver observer;
-    service_->AddObserver(&observer);
+    NotificationsObserver observer;
+    service_->notifications()->AddObserver(&observer);
     service_->OnNotificationsInstanceReady(
         std::move(arc_notifications_instance));
 
     while (!observer.IsReady())
       loop_.RunUntilIdle();
 
-    service_->RemoveObserver(&observer);
+    service_->notifications()->RemoveObserver(&observer);
   }
 
   void TearDown() override {
     arc_notification_manager_.reset();
     message_center_.reset();
     service_.reset();
     arc_notifications_instance_.reset();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ArcNotificationManagerTest);
@@ skipping 31 matching lines @@
 }
 
 TEST_F(ArcNotificationManagerTest, NotificationRemovedByConnectionClose) {
   service()->SetReady();
   EXPECT_EQ(0u, message_center()->GetVisibleNotifications().size());
   CreateNotificationWithKey("notification1");
   CreateNotificationWithKey("notification2");
   CreateNotificationWithKey("notification3");
   EXPECT_EQ(3u, message_center()->GetVisibleNotifications().size());
 
-  arc_notification_manager()->OnNotificationsInstanceClosed();
+  arc_notification_manager()->OnInstanceClosed(nullptr);
 
   EXPECT_EQ(0u, message_center()->GetVisibleNotifications().size());
 }
 
 }  // namespace arc