arc: Use GET_INTERFACE_FOR_METHOD macro

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 "base/strings/utf_string_conversions.h"
 #include "components/arc/arc_bridge_service.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 {
 
-namespace {
-
-// Min version to support Create/CloseNotificationWindow.
-constexpr int kMinVersionNotificationWindow = 7;
-
-}  // namespace
-
 ArcNotificationManager::ArcNotificationManager(ArcBridgeService* bridge_service,
                                                const AccountId& main_profile_id)
     : ArcNotificationManager(bridge_service,
                              main_profile_id,
                              message_center::MessageCenter::Get()) {}
 
 ArcNotificationManager::ArcNotificationManager(
     ArcBridgeService* bridge_service,
     const AccountId& main_profile_id,
     message_center::MessageCenter* message_center)
     : ArcService(bridge_service),
       main_profile_id_(main_profile_id),
       message_center_(message_center),
       binding_(this) {
   arc_bridge_service()->notifications()->AddObserver(this);
 }
 
 ArcNotificationManager::~ArcNotificationManager() {
   arc_bridge_service()->notifications()->RemoveObserver(this);
 }
 
 void ArcNotificationManager::OnInstanceReady() {
   DCHECK(!ready_);
 
   auto* notifications_instance =
-      arc_bridge_service()->notifications()->GetInstanceForMethod("Init");
+      GET_INSTANCE_FOR_METHOD(arc_bridge_service()->notifications(), Init);
   DCHECK(notifications_instance);
 
   notifications_instance->Init(binding_.CreateInterfacePtrAndBind());
   ready_ = true;
 }
 
 void ArcNotificationManager::OnInstanceClosed() {
   DCHECK(ready_);
   while (!items_.empty()) {
     auto it = items_.begin();
@@ skipping 48 matching lines @@
     VLOG(3) << "Chrome requests to remove a notification (key: " << key
             << "), 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()->GetInstanceForMethod(
-          "SendNotificationEventToAndroid");
+  auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+      arc_bridge_service()->notifications(), 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()->GetInstanceForMethod(
-          "SendNotificationEventToAndroid");
+  auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+      arc_bridge_service()->notifications(), 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()->GetInstanceForMethod(
-          "SendNotificationEventToAndroid");
+  auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+      arc_bridge_service()->notifications(), 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;
   }
 
   mojom::ArcNotificationEvent command;
   switch (button_index) {
@@ skipping 21 matching lines @@
   notifications_instance->SendNotificationEventToAndroid(key, command);
 }
 
 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()->GetInstanceForMethod(
-          "CreateNotificationWindow", kMinVersionNotificationWindow);
+  auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+      arc_bridge_service()->notifications(), CreateNotificationWindow);
   if (!notifications_instance)
     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()->GetInstanceForMethod(
-          "CloseNotificationWindow", kMinVersionNotificationWindow);
+  auto* notifications_instance = GET_INSTANCE_FOR_METHOD(
+      arc_bridge_service()->notifications(), CloseNotificationWindow);
   if (!notifications_instance)
     return;
 
   notifications_instance->CloseNotificationWindow(key);
 }
 
 void ArcNotificationManager::OnToastPosted(mojom::ArcToastDataPtr data) {
   const base::string16 text16(
       base::UTF8ToUTF16(data->text.has_value() ? *data->text : std::string()));
   const base::string16 dismiss_text16(base::UTF8ToUTF16(
       data->dismiss_text.has_value() ? *data->dismiss_text : std::string()));
   ash::WmShell::Get()->toast_manager()->Show(
       ash::ToastData(data->id, text16, data->duration, dismiss_text16));
 }
 
 void ArcNotificationManager::OnToastCancelled(mojom::ArcToastDataPtr data) {
   ash::WmShell::Get()->toast_manager()->Cancel(data->id);
 }
 
 }  // namespace arc