arc-bridge: Introduce the ArcService class

ui/arc/notification/arc_notification_manager.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 "ui/arc/notification/arc_notification_manager.h"
 
 #include "base/stl_util.h"
 #include "ui/arc/notification/arc_notification_item.h"
 
 namespace arc {
 
-ArcNotificationManager::ArcNotificationManager(ArcBridgeService* arc_bridge,
-                                               const AccountId& main_profile_id)
-    : arc_bridge_(arc_bridge),
+ArcNotificationManager::ArcNotificationManager(
+    ArcBridgeService* arc_bridge_service,
+    const AccountId& main_profile_id)
+    : arc_bridge_service_(arc_bridge_service),
       main_profile_id_(main_profile_id),
       binding_(this) {
-  // This must be initialized after ArcBridgeService.
-  DCHECK(arc_bridge_);
-  DCHECK_EQ(arc_bridge_, ArcBridgeService::Get());
-  arc_bridge_->AddObserver(this);
+  DCHECK(arc_bridge_service_);
+  arc_bridge_service_->AddObserver(this);
+
+  // If NotificationsInstance was ready before we AddObserver(), we won't get
+  // OnNotificationsInstanceReady events. For such case, we have to call it
+  // explicitly.
+  if (arc_bridge_service_->notifications_instance())
+    OnNotificationsInstanceReady();
 }
 
 ArcNotificationManager::~ArcNotificationManager() {
-  // This should be free'd before ArcBridgeService.
-  DCHECK(ArcBridgeService::Get());
-  DCHECK_EQ(arc_bridge_, ArcBridgeService::Get());
-  arc_bridge_->RemoveObserver(this);
+  arc_bridge_service_->RemoveObserver(this);
 }
 
 void ArcNotificationManager::OnNotificationsInstanceReady() {
   NotificationsInstance* notifications_instance =
-      arc_bridge_->notifications_instance();
+      arc_bridge_service_->notifications_instance();
   if (!notifications_instance) {
     VLOG(2) << "Request to refresh app list when bridge service is not ready.";
     return;
   }
 
   NotificationsHostPtr host;
   binding_.Bind(mojo::GetProxy(&host));
   notifications_instance->Init(std::move(host));
 }
 
@@ skipping 25 matching lines @@
     const std::string& key) {
   ItemMap::iterator it = items_.find(key);
   if (it == items_.end()) {
     VLOG(3) << "Chrome requests to remove a notification (key: " << key
             << "), but it is already gone.";
     return;
   }
 
   scoped_ptr<ArcNotificationItem> item(items_.take_and_erase(it));
 
-  arc_bridge_->notifications_instance()->SendNotificationEventToAndroid(
+  arc_bridge_service_->notifications_instance()->SendNotificationEventToAndroid(
       key, ARC_NOTIFICATION_EVENT_CLOSED);
 }
 
 void ArcNotificationManager::SendNotificationClickedOnChrome(
     const std::string& key) {
   if (!items_.contains(key)) {
     VLOG(3) << "Chrome requests to fire a click event on notification (key: "
             << key << "), but it is gone.";
     return;
   }
 
-  arc_bridge_->notifications_instance()->SendNotificationEventToAndroid(
+  arc_bridge_service_->notifications_instance()->SendNotificationEventToAndroid(
       key, ARC_NOTIFICATION_EVENT_BODY_CLICKED);
 }
 
 }  // namespace arc