ARC Notification: Fix crash on shutdown

The ARC services may quit earlier than notifications, so we need to check if the services has quitted or not before handling events.

BUG=b/27138093
TEST=none

Review URL: https://codereview.chromium.org/1701873002

Cr-Commit-Position: refs/heads/master@{#375783}

2 files changed, 39 insertions, 11 deletions

diff --git a/ui/arc/notification/arc_notification_manager.cc b/ui/arc/notification/arc_notification_manager.cc
index 8221670..a98db94 100644
--- a/ui/arc/notification/arc_notification_manager.cc
+++ b/ui/arc/notification/arc_notification_manager.cc
@@ -22,8 +22,7 @@ ArcNotificationManager::~ArcNotificationManager() {
 }
 
 void ArcNotificationManager::OnNotificationsInstanceReady() {
-  NotificationsInstance* notifications_instance =
-      arc_bridge_service()->notifications_instance();
+  auto notifications_instance = arc_bridge_service()->notifications_instance();
   if (!notifications_instance) {
     VLOG(2) << "Request to refresh app list when bridge service is not ready.";
     return;
@@ -32,6 +31,10 @@ void ArcNotificationManager::OnNotificationsInstanceReady() {
   notifications_instance->Init(binding_.CreateInterfacePtrAndBind());
 }
 
+void ArcNotificationManager::OnNotificationsInstanceClosed() {
+  // TODO(yoshiki): Handle this.
+}
+
 void ArcNotificationManager::OnNotificationPosted(ArcNotificationDataPtr data) {
   ArcNotificationItem* item = items_.get(data->key);
   if (!item) {
@@ -65,11 +68,19 @@ void ArcNotificationManager::SendNotificationRemovedFromChrome(
     return;
   }
 
-  scoped_ptr<ArcNotificationItem> item(items_.take_and_erase(it));
+  items_.erase(it);
 
-  arc_bridge_service()
-      ->notifications_instance()
-      ->SendNotificationEventToAndroid(key, ArcNotificationEvent::CLOSED);
+  auto notifications_instance = arc_bridge_service()->notifications_instance();
+
+  // On shutdown, the ARC channel may quit earlier then notifications.
+  if (!notifications_instance) {
+    VLOG(2) << "ARC Notification (key: " << key
+            << ") is closed, but the ARC channel has already gone.";
+    return;
+  }
+
+  notifications_instance->SendNotificationEventToAndroid(
+      key, ArcNotificationEvent::CLOSED);
 }
 
 void ArcNotificationManager::SendNotificationClickedOnChrome(
@@ -80,9 +91,17 @@ void ArcNotificationManager::SendNotificationClickedOnChrome(
     return;
   }
 
-  arc_bridge_service()
-      ->notifications_instance()
-      ->SendNotificationEventToAndroid(key, ArcNotificationEvent::BODY_CLICKED);
+  auto notifications_instance = arc_bridge_service()->notifications_instance();
+
+  // On shutdown, the ARC channel may quit earlier then notifications.
+  if (!notifications_instance) {
+    VLOG(2) << "ARC Notification (key: " << key
+            << ") is clicked, but the ARC channel has already gone.";
+    return;
+  }
+
+  notifications_instance->SendNotificationEventToAndroid(
+      key, ArcNotificationEvent::BODY_CLICKED);
 }
 
 void ArcNotificationManager::SendNotificationButtonClickedOnChrome(
@@ -93,6 +112,15 @@ void ArcNotificationManager::SendNotificationButtonClickedOnChrome(
     return;
   }
 
+  auto notifications_instance = arc_bridge_service()->notifications_instance();
+
+  // On shutdown, the ARC channel may quit earlier then notifications.
+  if (!notifications_instance) {
+    VLOG(2) << "ARC Notification (key: " << key
+            << ")'s button is clicked, but the ARC channel has already gone.";
+    return;
+  }
+
   arc::ArcNotificationEvent command;
   switch (button_index) {
     case 0:
@@ -116,8 +144,7 @@ void ArcNotificationManager::SendNotificationButtonClickedOnChrome(
       return;
   }
 
-  arc_bridge_service()
-      ->notifications_instance()->SendNotificationEventToAndroid(key, command);
+  notifications_instance->SendNotificationEventToAndroid(key, command);
 }
 
 }  // namespace arc
diff --git a/ui/arc/notification/arc_notification_manager.h b/ui/arc/notification/arc_notification_manager.h
index 1d46b8f..008cfda 100644
--- a/ui/arc/notification/arc_notification_manager.h
+++ b/ui/arc/notification/arc_notification_manager.h
@@ -29,6 +29,7 @@ class ArcNotificationManager : public ArcService,
 
   // ArcBridgeService::Observer implementation:
   void OnNotificationsInstanceReady() override;
+  void OnNotificationsInstanceClosed() override;
 
   // NotificationsHost implementation:
   void OnNotificationPosted(ArcNotificationDataPtr data) override;