Reduce FakeArcBridgeService usage.

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 <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 62 matching lines @@
 };
 
 }  // anonymous namespace
 
 class ArcNotificationManagerTest : public testing::Test {
  public:
   ArcNotificationManagerTest() {}
   ~ArcNotificationManagerTest() override { base::RunLoop().RunUntilIdle(); }
 
  protected:
-  FakeArcBridgeService* service() { return service_.get(); }
   FakeNotificationsInstance* arc_notifications_instance() {
     return arc_notifications_instance_.get();
   }
   ArcNotificationManager* arc_notification_manager() {
     return arc_notification_manager_.get();
   }
   MockMessageCenter* message_center() { return message_center_.get(); }
 
   std::string CreateNotification() {
     return CreateNotificationWithKey(kDummyNotificationKey);
   }
 
   std::string CreateNotificationWithKey(const std::string& key) {
     auto data = mojom::ArcNotificationData::New();
     data->key = key;
     data->title = "TITLE";
     data->message = "MESSAGE";
 
     std::vector<unsigned char> icon_data;
     data->icon_data = icon_data;
 
     arc_notification_manager()->OnNotificationPosted(std::move(data));
 
     return key;
   }
 
  private:
   base::MessageLoop loop_;
-  std::unique_ptr<FakeArcBridgeService> service_;
+  std::unique_ptr<ArcBridgeService> service_;
   std::unique_ptr<FakeNotificationsInstance> arc_notifications_instance_;
   std::unique_ptr<ArcNotificationManager> arc_notification_manager_;
   std::unique_ptr<MockMessageCenter> message_center_;
 
   void SetUp() override {
-    arc_notifications_instance_.reset(new FakeNotificationsInstance());
-    service_.reset(new FakeArcBridgeService());
-    message_center_.reset(new MockMessageCenter());
+    arc_notifications_instance_ = base::MakeUnique<FakeNotificationsInstance>();
+    service_ = base::MakeUnique<ArcBridgeService>();
+    message_center_ = base::MakeUnique<MockMessageCenter>();
 
-    arc_notification_manager_.reset(new ArcNotificationManager(
-        service(), EmptyAccountId(), message_center_.get()));
+    arc_notification_manager_ = base::MakeUnique<ArcNotificationManager>(
+        service_.get(), EmptyAccountId(), message_center_.get());
 
     NotificationsObserver observer;
     service_->notifications()->AddObserver(&observer);
     service_->notifications()->SetInstance(arc_notifications_instance_.get());
 
     while (!observer.IsReady())
       base::RunLoop().RunUntilIdle();
 
     service_->notifications()->RemoveObserver(&observer);
   }
@@ skipping 12 matching lines @@
   EXPECT_EQ(0u, message_center()->GetVisibleNotifications().size());
   std::string key = CreateNotification();
   EXPECT_EQ(1u, message_center()->GetVisibleNotifications().size());
 
   arc_notification_manager()->OnNotificationRemoved(key);
 
   EXPECT_EQ(0u, message_center()->GetVisibleNotifications().size());
 }
 
 TEST_F(ArcNotificationManagerTest, NotificationRemovedByChrome) {
-  service()->SetReady();
   EXPECT_EQ(0u, message_center()->GetVisibleNotifications().size());
   std::string key = CreateNotification();
   EXPECT_EQ(1u, message_center()->GetVisibleNotifications().size());
 
   {
     message_center::Notification* notification =
         *message_center()->GetVisibleNotifications().begin();
     notification->delegate()->Close(true /* by_user */);
     // |notification| gets stale here.
   }
 
   ASSERT_EQ(1u, arc_notifications_instance()->events().size());
   EXPECT_EQ(key, arc_notifications_instance()->events().at(0).first);
   EXPECT_EQ(mojom::ArcNotificationEvent::CLOSED,
             arc_notifications_instance()->events().at(0).second);
 }
 
 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()->OnInstanceClosed();
 
   EXPECT_EQ(0u, message_center()->GetVisibleNotifications().size());
 }
 
 }  // namespace arc