Use ARC_GET_INSTANCE_FOR_METHOD for getting intent_helper instance

components/arc/intent_helper/arc_intent_helper_bridge.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 "components/arc/intent_helper/arc_intent_helper_bridge.h"
 
 #include <utility>
 
 #include "ash/common/new_window_controller.h"
 #include "ash/common/shell_delegate.h"
@@ skipping 108 matching lines @@
   std::vector<mojom::IntentHandlerInfoPtr> handlers_filtered;
   for (auto& handler : handlers) {
     if (IsIntentHelperPackage(handler->package_name))
       continue;
     handlers_filtered.push_back(std::move(handler));
   }
   return handlers_filtered;
 }
 
 // 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())) {
       VLOG(2) << "ARC bridge is not supported.";
       if (out_error_code)
         *out_error_code = GetResult::FAILED_ARC_NOT_SUPPORTED;
     } else {
       VLOG(2) << "ARC bridge is not ready.";
       if (out_error_code)
         *out_error_code = GetResult::FAILED_ARC_NOT_READY;
     }
-    return nullptr;
+    return false;
   }
 
   auto* intent_helper_holder =
       arc_service_manager->arc_bridge_service()->intent_helper();
   if (!intent_helper_holder->has_instance()) {
     VLOG(2) << "ARC intent helper instance is not ready.";
     if (out_error_code)
       *out_error_code = GetResult::FAILED_ARC_NOT_READY;
-    return nullptr;
+    return false;
   }
 
-  // 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 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(
     std::vector<IntentFilter> filters) {
   DCHECK(thread_checker_.CalledOnValidThread());
   activity_resolver_->UpdateIntentFilters(std::move(filters));
 
   for (auto& observer : observer_list_)
     observer.OnIntentFiltersUpdated();
 }
 
 }  // namespace arc