Use ARC_GET_INSTANCE_FOR_METHOD for getting intent_helper instance

This is safer than manually specifying min versions.

BUG=649782
TEST=git try, manually tested files.app, context menu, and link click

Review-Url: https://codereview.chromium.org/2614173002
Cr-Commit-Position: refs/heads/master@{#442119}

chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc

@@ -34,10 +34,6 @@ namespace arc {
 
 namespace {
 
-constexpr uint32_t kMinVersionForHandleUrl = 2;
-constexpr uint32_t kMinVersionForRequestUrlHandlerList = 2;
-constexpr uint32_t kMinVersionForAddPreferredPackage = 7;
-
 // TODO(yusukes|djacobo): Find a better way to detect a request loop and remove
 // the global variables.
 base::LazyInstance<GURL> g_last_url = LAZY_INSTANCE_INITIALIZER;
@@ -90,8 +86,11 @@ void OpenUrlInChrome(int render_process_host_id,
 void HandleUrlInArc(int render_process_host_id,
                     int routing_id,
                     const std::pair<GURL, std::string>& url_and_package) {
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "HandleUrl", kMinVersionForHandleUrl);
+  auto* arc_service_manager = ArcServiceManager::Get();
+  if (!arc_service_manager)
+    return;
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_service_manager->arc_bridge_service()->intent_helper(), HandleUrl);
   if (!instance)
     return;
 
@@ -260,9 +259,15 @@ void OnIntentPickerClosed(int render_process_host_id,
   // |package_name| matches a valid option and return the index.
   const size_t selected_app_index =
       ArcNavigationThrottle::GetAppIndex(handlers, selected_app_package);
+
   // Make sure that the instance at least supports HandleUrl.
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "HandleUrl", kMinVersionForHandleUrl);
+  auto* arc_service_manager = ArcServiceManager::Get();
+  mojom::IntentHelperInstance* instance = nullptr;
+  if (arc_service_manager) {
+    instance = ARC_GET_INSTANCE_FOR_METHOD(
+        arc_service_manager->arc_bridge_service()->intent_helper(), HandleUrl);
+  }
+
   if (!instance) {
     close_reason = ArcNavigationThrottle::CloseReason::ERROR;
   } else if (close_reason ==
@@ -280,8 +285,10 @@ void OnIntentPickerClosed(int render_process_host_id,
 
   switch (close_reason) {
     case ArcNavigationThrottle::CloseReason::ALWAYS_PRESSED: {
-      if (ArcIntentHelperBridge::GetIntentHelperInstance(
-              "AddPreferredPackage", kMinVersionForAddPreferredPackage)) {
+      DCHECK(arc_service_manager);
+      if (ARC_GET_INSTANCE_FOR_METHOD(
+              arc_service_manager->arc_bridge_service()->intent_helper(),
+              AddPreferredPackage)) {
         instance->AddPreferredPackage(
             handlers[selected_app_index]->package_name);
       }
@@ -328,7 +335,7 @@ void OnAppIconsReceived(
     std::unique_ptr<ActivityIconLoader::ActivityToIconsMap> icons) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  using AppInfo = arc::ArcNavigationThrottle::AppInfo;
+  using AppInfo = ArcNavigationThrottle::AppInfo;
   std::vector<AppInfo> app_info;
 
   for (const auto& handler : handlers) {
@@ -356,8 +363,15 @@ void OnUrlHandlerList(int render_process_host_id,
                       std::vector<mojom::IntentHandlerInfoPtr> handlers) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "HandleUrl", kMinVersionForHandleUrl);
+  auto* arc_service_manager = ArcServiceManager::Get();
+  if (!arc_service_manager) {
+    // ARC is not running anymore. Show the Chrome OS dialog.
+    ShowFallbackExternalProtocolDialog(render_process_host_id, routing_id, url);
+    return;
+  }
+
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_service_manager->arc_bridge_service()->intent_helper(), HandleUrl);
   scoped_refptr<ActivityIconLoader> icon_loader = GetIconLoader();
 
   if (!instance || !icon_loader) {
@@ -457,11 +471,16 @@ bool RunArcExternalProtocolDialog(const GURL& url,
     return false;
   }
 
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "RequestUrlHandlerList", kMinVersionForRequestUrlHandlerList);
-  if (!instance)
+  auto* arc_service_manager = ArcServiceManager::Get();
+  if (!arc_service_manager)
     return false;  // ARC is either not supported or not yet ready.
 
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_service_manager->arc_bridge_service()->intent_helper(),
+      RequestUrlHandlerList);
+  if (!instance)
+    return false;  // the same.
+
   WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_host_id, routing_id);
   if (!web_contents || !web_contents->GetBrowserContext() ||

chrome/browser/chromeos/arc/intent_helper/arc_navigation_throttle.cc

@@ -27,10 +27,6 @@ namespace arc {
 
 namespace {
 
-constexpr uint32_t kMinVersionForHandleUrl = 2;
-constexpr uint32_t kMinVersionForRequestUrlHandlerList = 2;
-constexpr uint32_t kMinVersionForAddPreferredPackage = 7;
-
 scoped_refptr<ActivityIconLoader> GetIconLoader() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ArcServiceManager* arc_service_manager = ArcServiceManager::Get();
@@ -182,7 +178,9 @@ ArcNavigationThrottle::HandleRequest() {
     return content::NavigationThrottle::PROCEED;
 
   ArcServiceManager* arc_service_manager = ArcServiceManager::Get();
-  DCHECK(arc_service_manager);
+  if (!arc_service_manager)
+    return content::NavigationThrottle::PROCEED;
+
   scoped_refptr<LocalActivityResolver> local_resolver =
       arc_service_manager->activity_resolver();
   if (local_resolver->ShouldChromeHandleUrl(url)) {
@@ -191,8 +189,9 @@ ArcNavigationThrottle::HandleRequest() {
     return content::NavigationThrottle::PROCEED;
   }
 
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "RequestUrlHandlerList", kMinVersionForRequestUrlHandlerList);
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_service_manager->arc_bridge_service()->intent_helper(),
+      RequestUrlHandlerList);
   if (!instance)
     return content::NavigationThrottle::PROCEED;
   instance->RequestUrlHandlerList(
@@ -296,8 +295,13 @@ void ArcNavigationThrottle::OnIntentPickerClosed(
   previous_user_action_ = close_reason;
 
   // Make sure that the instance at least supports HandleUrl.
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "HandleUrl", kMinVersionForHandleUrl);
+  auto* arc_service_manager = ArcServiceManager::Get();
+  mojom::IntentHelperInstance* instance = nullptr;
+  if (arc_service_manager) {
+    instance = ARC_GET_INSTANCE_FOR_METHOD(
+        arc_service_manager->arc_bridge_service()->intent_helper(), HandleUrl);
+  }
+
   // Since we are selecting an app by its package name, we need to locate it
   // on the |handlers| structure before sending the IPC to ARC.
   const size_t selected_app_index = GetAppIndex(handlers, selected_app_package);
@@ -323,8 +327,10 @@ void ArcNavigationThrottle::OnIntentPickerClosed(
     case CloseReason::ALWAYS_PRESSED: {
       // Call AddPreferredPackage if it is supported. Reusing the same
       // |instance| is okay.
-      if (ArcIntentHelperBridge::GetIntentHelperInstance(
-              "AddPreferredPackage", kMinVersionForAddPreferredPackage)) {
+      DCHECK(arc_service_manager);
+      if (ARC_GET_INSTANCE_FOR_METHOD(
+              arc_service_manager->arc_bridge_service()->intent_helper(),
+              AddPreferredPackage)) {
         instance->AddPreferredPackage(
             handlers[selected_app_index]->package_name);
       }

chrome/browser/chromeos/file_manager/arc_file_tasks.cc

@@ -33,26 +33,8 @@ 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);
@@ -189,9 +171,16 @@ void FindArcTasks(Profile* profile,
                   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;
@@ -228,9 +217,16 @@ bool ExecuteArcTask(Profile* profile,
   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;
 

components/arc/intent_helper/activity_icon_loader.cc

@@ -28,14 +28,27 @@ constexpr size_t kLargeIconSizeInDip = 20;
 constexpr size_t kMaxIconSizeInPx = 200;
 constexpr char kPngDataUrlPrefix[] = "data:image/png;base64,";
 
-constexpr int kMinInstanceVersion = 3;  // see intent_helper.mojom
-
 ui::ScaleFactor GetSupportedScaleFactor() {
   std::vector<ui::ScaleFactor> scale_factors = ui::GetSupportedScaleFactors();
   DCHECK(!scale_factors.empty());
   return scale_factors.back();
 }
 
+// Returns an instance for calling RequestActivityIcons().
+mojom::IntentHelperInstance* GetInstanceForRequestActivityIcons(
+    ArcIntentHelperBridge::GetResult* out_error_code) {
+  if (!ArcIntentHelperBridge::IsIntentHelperAvailable(out_error_code))
+    return nullptr;
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      ArcServiceManager::Get()->arc_bridge_service()->intent_helper(),
+      RequestActivityIcons);
+  if (!instance && out_error_code) {
+    *out_error_code =
+        ArcIntentHelperBridge::GetResult::FAILED_ARC_NOT_SUPPORTED;
+  }
+  return instance;
+}
+
 }  // namespace
 
 ActivityIconLoader::Icons::Icons(
@@ -97,8 +110,7 @@ ActivityIconLoader::GetResult ActivityIconLoader::GetActivityIcons(
   }
 
   ArcIntentHelperBridge::GetResult error_code;
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
-      "RequestActivityIcons", kMinInstanceVersion, &error_code);
+  auto* instance = GetInstanceForRequestActivityIcons(&error_code);
   if (!instance) {
     // The mojo channel is not yet ready (or not supported at all). Run the
     // callback with |result| that could be empty.

components/arc/intent_helper/arc_intent_helper_bridge.cc

@@ -126,11 +126,7 @@ ArcIntentHelperBridge::FilterOutIntentHelper(
 }
 
 // static
-mojom::IntentHelperInstance*
-ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
-    const std::string& method_name_for_logging,
-    uint32_t min_instance_version,
-    GetResult* out_error_code) {
+bool ArcIntentHelperBridge::IsIntentHelperAvailable(GetResult* out_error_code) {
   auto* arc_service_manager = ArcServiceManager::Get();
   if (!arc_service_manager) {
     if (!ArcBridgeService::GetEnabled(base::CommandLine::ForCurrentProcess())) {
@@ -142,7 +138,7 @@ ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
       if (out_error_code)
         *out_error_code = GetResult::FAILED_ARC_NOT_READY;
     }
-    return nullptr;
+    return false;
   }
 
   auto* intent_helper_holder =
@@ -151,26 +147,10 @@ ArcIntentHelperBridge::GetIntentHelperInstanceWithErrorCode(
     VLOG(2) << "ARC intent helper instance is not ready.";
     if (out_error_code)
       *out_error_code = GetResult::FAILED_ARC_NOT_READY;
-    return nullptr;
-  }
-
-  // TODO(lhchavez): Stop calling GetInstanceForVersion() directly.
-  auto* instance = intent_helper_holder->GetInstanceForVersion(
-      min_instance_version, method_name_for_logging.c_str());
-  if (!instance) {
-    if (out_error_code)
-      *out_error_code = GetResult::FAILED_ARC_NOT_SUPPORTED;
-    return nullptr;
+    return false;
   }
-  return instance;
-}
 
-// static
-mojom::IntentHelperInstance* ArcIntentHelperBridge::GetIntentHelperInstance(
-    const std::string& method_name_for_logging,
-    uint32_t min_instance_version) {
-  return GetIntentHelperInstanceWithErrorCode(method_name_for_logging,
-                                              min_instance_version, nullptr);
+  return true;
 }
 
 void ArcIntentHelperBridge::OnIntentFiltersUpdated(

components/arc/intent_helper/arc_intent_helper_bridge.h

@@ -82,17 +82,9 @@ class ArcIntentHelperBridge
   static std::vector<mojom::IntentHandlerInfoPtr> FilterOutIntentHelper(
       std::vector<mojom::IntentHandlerInfoPtr> handlers);
 
-  // Gets the mojo instance if it's available. On failure, returns nullptr and
-  // updates |out_error_code| if it's not nullptr.
-  static mojom::IntentHelperInstance* GetIntentHelperInstanceWithErrorCode(
-      const std::string& method_name_for_logging,
-      uint32_t min_instance_version,
-      GetResult* out_error_code);
-
-  // Does the same as above without asking for the error code.
-  static mojom::IntentHelperInstance* GetIntentHelperInstance(
-      const std::string& method_name_for_logging,
-      uint32_t min_instance_version);
+  // Checks if the intent helper interface is available. When it is not, returns
+  // false and updates |out_error_code| if it's not nullptr.
+  static bool IsIntentHelperAvailable(GetResult* out_error_code);
 
   static const char kArcIntentHelperPackageName[];
 

components/arc/intent_helper/link_handler_model_impl.cc

@@ -9,6 +9,7 @@
 
 #include "base/bind.h"
 #include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_service_manager.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/google/core/browser/google_util.h"
 #include "url/gurl.h"
@@ -18,7 +19,6 @@ namespace arc {
 
 namespace {
 
-constexpr int kMinInstanceVersion = 2;  // see intent_helper.mojom
 constexpr int kMaxValueLen = 2048;
 
 bool GetQueryValue(const GURL& url,
@@ -55,8 +55,12 @@ LinkHandlerModelImpl::LinkHandlerModelImpl(
 LinkHandlerModelImpl::~LinkHandlerModelImpl() {}
 
 bool LinkHandlerModelImpl::Init(const GURL& url) {
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "RequestUrlHandlerList", kMinInstanceVersion);
+  auto* arc_service_manager = ArcServiceManager::Get();
+  if (!arc_service_manager)
+    return false;
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_service_manager->arc_bridge_service()->intent_helper(),
+      RequestUrlHandlerList);
   if (!instance)
     return false;
 
@@ -77,8 +81,11 @@ void LinkHandlerModelImpl::AddObserver(Observer* observer) {
 
 void LinkHandlerModelImpl::OpenLinkWithHandler(const GURL& url,
                                                uint32_t handler_id) {
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "HandleUrl", kMinInstanceVersion);
+  auto* arc_service_manager = ArcServiceManager::Get();
+  if (!arc_service_manager)
+    return;
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_service_manager->arc_bridge_service()->intent_helper(), HandleUrl);
   if (!instance)
     return;
   if (handler_id >= handlers_.size())