Always use arc::InstanceHolder<T>::GetInstanceForMethod

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 <memory>
 #include <utility>
 
 #include "ash/common/system/toast/toast_manager.h"
@@ skipping 31 matching lines @@
 }
 
 ArcNotificationManager::~ArcNotificationManager() {
   arc_bridge_service()->notifications()->RemoveObserver(this);
 }
 
 void ArcNotificationManager::OnInstanceReady() {
   DCHECK(!ready_);
 
   auto* notifications_instance =
-      arc_bridge_service()->notifications()->instance();
-  if (!notifications_instance) {
-    VLOG(2) << "Request to refresh app list when bridge service is not ready.";
+      arc_bridge_service()->notifications()->GetInstanceForMethod("Init");
+  if (!notifications_instance)
     return;
-  }
 
   notifications_instance->Init(binding_.CreateInterfacePtrAndBind());
   ready_ = true;
 }
 
 void ArcNotificationManager::OnInstanceClosed() {
   DCHECK(ready_);
   while (!items_.empty()) {
     auto it = items_.begin();
     std::unique_ptr<ArcNotificationItem> item = std::move(it->second);
@@ skipping 48 matching lines @@
             << "), but it is already gone.";
     return;
   }
 
   // The removed ArcNotificationItem needs to live in this scope, since the
   // given argument |key| may be a part of the removed item.
   std::unique_ptr<ArcNotificationItem> item = std::move(it->second);
   items_.erase(it);
 
   auto* notifications_instance =
-      arc_bridge_service()->notifications()->instance();
+      arc_bridge_service()->notifications()->GetInstanceForMethod(
+          "SendNotificationEventToAndroid");
 
   // 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, mojom::ArcNotificationEvent::CLOSED);
 }
 
 void ArcNotificationManager::SendNotificationClickedOnChrome(
     const std::string& key) {
   if (items_.find(key) == items_.end()) {
     VLOG(3) << "Chrome requests to fire a click event on notification (key: "
             << key << "), but it is gone.";
     return;
   }
 
   auto* notifications_instance =
-      arc_bridge_service()->notifications()->instance();
+      arc_bridge_service()->notifications()->GetInstanceForMethod(
+          "SendNotificationEventToAndroid");
 
   // 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, mojom::ArcNotificationEvent::BODY_CLICKED);
 }
 
 void ArcNotificationManager::SendNotificationButtonClickedOnChrome(
     const std::string& key,
     int button_index) {
   if (items_.find(key) == items_.end()) {
     VLOG(3) << "Chrome requests to fire a click event on notification (key: "
             << key << "), but it is gone.";
     return;
   }
 
   auto* notifications_instance =
-      arc_bridge_service()->notifications()->instance();
+      arc_bridge_service()->notifications()->GetInstanceForMethod(
+          "SendNotificationEventToAndroid");
 
   // 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::mojom::ArcNotificationEvent command;
   switch (button_index) {
@@ skipping 57 matching lines @@
   ash::WmShell::Get()->toast_manager()->Show(
       ash::ToastData(data->id, data->text.To<base::string16>(), data->duration,
                      data->dismiss_text.To<base::string16>()));
 }
 
 void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {
   ash::WmShell::Get()->toast_manager()->Cancel(data->id);
 }
 
 }  // namespace arc