arc: Use GET_INTERFACE_FOR_METHOD macro

chrome/browser/chromeos/note_taking_helper.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 "chrome/browser/chromeos/note_taking_helper.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "apps/launcher.h"
 #include "ash/common/system/chromeos/palette/palette_utils.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_service_manager.h"
 #include "components/arc/common/intent_helper.mojom.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/extension.h"
 #include "url/gurl.h"
 
 namespace app_runtime = extensions::api::app_runtime;
@@ skipping 13 matching lines @@
 
 // Returns true if |app_id|, a value from prefs::kNoteTakingAppId, looks like
 // it's probably an Android package name rather than a Chrome extension ID.
 bool LooksLikeAndroidPackageName(const std::string& app_id) {
   // Android package names are required to contain at least one period (see
   // validateName() in PackageParser.java), while Chrome extension IDs contain
   // only characters in [a-p].
   return app_id.find(".") != std::string::npos;
 }
 
-// Returns the helper used for intent-related communication with Android, or
-// null if it's unavailable.
-arc::mojom::IntentHelperInstance* GetIntentHelper(const std::string& method,
-                                                  uint32_t min_version) {
-  return arc::ArcServiceManager::Get()
-      ->arc_bridge_service()
-      ->intent_helper()
-      ->GetInstanceForMethod(method, min_version);
-}
-
 // Creates a new Mojo IntentInfo struct for launching an Android note-taking app
 // with an optional ClipData URI.
 arc::mojom::IntentInfoPtr CreateIntentInfo(const GURL& clip_data_uri) {
   arc::mojom::IntentInfoPtr intent = arc::mojom::IntentInfo::New();
   intent->action = NoteTakingHelper::kIntentAction;
   if (!clip_data_uri.is_empty())
     intent->clip_data_uri = clip_data_uri.spec();
   return intent;
 }
 
@@ skipping 190 matching lines @@
     if (enabled_extensions.Contains(id)) {
       extensions.push_back(extension_registry->GetExtensionById(
           id, extensions::ExtensionRegistry::ENABLED));
     }
   }
   return extensions;
 }
 
 void NoteTakingHelper::UpdateAndroidApps() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  auto* helper = GetIntentHelper("RequestIntentHandlerList", 12);
+  auto* helper = ARC_GET_INSTANCE_FOR_METHOD(
+      arc::ArcServiceManager::Get()->arc_bridge_service()->intent_helper(),
+      RequestIntentHandlerList);
   if (!helper)
     return;
   helper->RequestIntentHandlerList(
       CreateIntentInfo(GURL()), base::Bind(&NoteTakingHelper::OnGotAndroidApps,
                                            weak_ptr_factory_.GetWeakPtr()));
 }
 
 void NoteTakingHelper::OnGotAndroidApps(
     std::vector<arc::mojom::IntentHandlerInfoPtr> handlers) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ skipping 16 matching lines @@
                                          const std::string& app_id,
                                          const base::FilePath& path) {
   DCHECK(profile);
 
   if (LooksLikeAndroidPackageName(app_id)) {
     // Android app.
     if (!arc::ArcSessionManager::Get()->IsAllowedForProfile(profile)) {
       LOG(WARNING) << "Can't launch Android app " << app_id << " for profile";
       return false;
     }
-    auto* helper = GetIntentHelper("HandleIntent", 10);
+    auto* helper = ARC_GET_INSTANCE_FOR_METHOD(
+        arc::ArcServiceManager::Get()->arc_bridge_service()->intent_helper(),
+        HandleIntent);
     if (!helper)
       return false;
 
     GURL clip_data_uri;
     if (!path.empty()) {
       if (!file_manager::util::ConvertPathToArcUrl(path, &clip_data_uri) ||
           !clip_data_uri.is_valid()) {
         LOG(WARNING) << "Failed to convert " << path.value() << " to ARC URI";
         return false;
       }
@@ skipping 50 matching lines @@
     for (auto& observer : observers_)
       observer.OnAvailableNoteTakingAppsUpdated();
   }
 }
 
 void NoteTakingHelper::OnShutdown(extensions::ExtensionRegistry* registry) {
   extension_registry_observer_.Remove(registry);
 }
 
 }  // namespace chromeos