arc: Add InstanceHelper::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"
 #include "ash/common/wm_shell.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "mojo/common/common_type_converters.h"
 #include "ui/arc/notification/arc_custom_notification_item.h"
 #include "ui/arc/notification/arc_notification_item.h"
 
 namespace arc {
 
@@ skipping 183 matching lines @@
 }
 
 void ArcNotificationManager::CreateNotificationWindow(const std::string& key) {
   if (items_.find(key) == items_.end()) {
     VLOG(3) << "Chrome requests to create window on notification (key: " << key
             << "), but it is gone.";
     return;
   }
 
   auto* notifications_instance =
-      arc_bridge_service()->notifications()->instance();
-  // On shutdown, the ARC channel may quit earlier then notifications.
-  if (!notifications_instance) {
-    VLOG(2) << "Request to create window for ARC Notification (key: " << key
-            << "), but the ARC channel has already gone.";
+      arc_bridge_service()->notifications()->GetInstanceForMethod(
+          "CreateNotificationWindow", kMinVersionNotificationWindow);
+  if (!notifications_instance)
     return;
-  }
-
-  if (arc_bridge_service()->notifications()->version() <
-      kMinVersionNotificationWindow) {
-    VLOG(2)
-        << "NotificationInstance does not support CreateNotificationWindow.";
-    return;
-  }
 
   notifications_instance->CreateNotificationWindow(key);
 }
 
 void ArcNotificationManager::CloseNotificationWindow(const std::string& key) {
   if (items_.find(key) == items_.end()) {
     VLOG(3) << "Chrome requests to close window on notification (key: " << key
             << "), but it is gone.";
     return;
   }
 
   auto* notifications_instance =
-      arc_bridge_service()->notifications()->instance();
-  // On shutdown, the ARC channel may quit earlier then notifications.
-  if (!notifications_instance) {
-    VLOG(2) << "Request to close window for ARC Notification (key: " << key
-            << "), but the ARC channel has already gone.";
+      arc_bridge_service()->notifications()->GetInstanceForMethod(
+          "CloseNotificationWindow", kMinVersionNotificationWindow);
+  if (!notifications_instance)
     return;
-  }
-
-  if (arc_bridge_service()->notifications()->version() <
-      kMinVersionNotificationWindow) {
-    VLOG(2) << "NotificationInstance does not support CloseNotificationWindow.";
-    return;
-  }
 
   notifications_instance->CloseNotificationWindow(key);
 }
 
 void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) {
   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