Use ARC_GET_INSTANCE_FOR_METHOD for getting intent_helper instance

chrome/browser/chromeos/file_manager/arc_file_tasks.cc

 // Copyright (c) 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/file_manager/arc_file_tasks.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 15 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/entry_info.h"
 #include "storage/browser/fileapi/file_system_url.h"
 #include "url/gurl.h"
 
 namespace file_manager {
 namespace file_tasks {
 
 namespace {
 
-constexpr int kArcIntentHelperVersionWithUrlListSupport = 4;
-constexpr int kArcIntentHelperVersionWithFullActivityName = 5;
-
 constexpr char kAppIdSeparator = '/';
 
-// Returns the Mojo interface for ARC Intent Helper, with version |minVersion|
-// or above. If the ARC bridge is not established, returns null.
-arc::mojom::IntentHelperInstance* GetArcIntentHelper(
-    Profile* profile,
-    const std::string& method_name_for_logging,
-    uint32_t min_version) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  // File manager in secondary profile cannot access ARC.
-  if (!chromeos::ProfileHelper::IsPrimaryProfile(profile))
-    return nullptr;
-  return arc::ArcIntentHelperBridge::GetIntentHelperInstance(
-      method_name_for_logging, min_version);
-}
-
 // Returns the icon loader that wraps the Mojo interface for ARC Intent Helper.
 scoped_refptr<arc::ActivityIconLoader> GetArcActivityIconLoader() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   arc::ArcServiceManager* arc_service_manager = arc::ArcServiceManager::Get();
   if (!arc_service_manager)
     return nullptr;
   return arc_service_manager->icon_loader();
 }
 
@@ skipping 116 matching lines @@
 }
 
 }  // namespace
 
 void FindArcTasks(Profile* profile,
                   const std::vector<extensions::EntryInfo>& entries,
                   std::unique_ptr<std::vector<FullTaskDescriptor>> result_list,
                   const FindTasksCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  arc::mojom::IntentHelperInstance* arc_intent_helper =
-      GetArcIntentHelper(profile, "RequestUrlListHandlerList",
-                         kArcIntentHelperVersionWithUrlListSupport);
+  arc::mojom::IntentHelperInstance* arc_intent_helper = nullptr;
+  // File manager in secondary profile cannot access ARC.
+  if (chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+    auto* arc_service_manager = arc::ArcServiceManager::Get();
+    if (arc_service_manager) {
+      arc_intent_helper = ARC_GET_INSTANCE_FOR_METHOD(
+          arc_service_manager->arc_bridge_service()->intent_helper(),
+          RequestUrlListHandlerList);
+    }
+  }
   if (!arc_intent_helper) {
     callback.Run(std::move(result_list));
     return;
   }
 
   std::vector<arc::mojom::UrlWithMimeTypePtr> urls;
   for (const extensions::EntryInfo& entry : entries) {
     if (entry.is_directory) {  // ARC apps don't support directories.
       callback.Run(std::move(result_list));
       return;
@@ skipping 16 matching lines @@
       base::Bind(&OnArcHandlerList, base::Passed(&result_list), callback));
 }
 
 bool ExecuteArcTask(Profile* profile,
                     const TaskDescriptor& task,
                     const std::vector<storage::FileSystemURL>& file_urls,
                     const std::vector<std::string>& mime_types) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK_EQ(file_urls.size(), mime_types.size());
 
-  arc::mojom::IntentHelperInstance* const arc_intent_helper =
-      GetArcIntentHelper(profile, "HandleUrlList",
-                         kArcIntentHelperVersionWithFullActivityName);
+  arc::mojom::IntentHelperInstance* arc_intent_helper = nullptr;
+  // File manager in secondary profile cannot access ARC.
+  if (chromeos::ProfileHelper::IsPrimaryProfile(profile)) {
+    auto* arc_service_manager = arc::ArcServiceManager::Get();
+    if (arc_service_manager) {
+      arc_intent_helper = ARC_GET_INSTANCE_FOR_METHOD(
+          arc_service_manager->arc_bridge_service()->intent_helper(),
+          HandleUrlList);
+    }
+  }
   if (!arc_intent_helper)
     return false;
 
   std::vector<arc::mojom::UrlWithMimeTypePtr> urls;
   for (size_t i = 0; i < file_urls.size(); ++i) {
     GURL url;
     if (!util::ConvertPathToArcUrl(file_urls[i].path(), &url)) {
       LOG(ERROR) << "File on unsuppored path";
       return false;
     }
 
     arc::mojom::UrlWithMimeTypePtr url_with_type =
         arc::mojom::UrlWithMimeType::New();
     url_with_type->url = url.spec();
     url_with_type->mime_type = mime_types[i];
     urls.push_back(std::move(url_with_type));
   }
 
   arc_intent_helper->HandleUrlList(
       std::move(urls), AppIdToActivityName(task.app_id),
       FileTaskActionIdToArcActionType(task.action_id));
   return true;
 }
 
 }  // namespace file_tasks
 }  // namespace file_manager