Index: components/arc/intent_helper/arc_intent_helper_bridge.cc |
diff --git a/components/arc/intent_helper/arc_intent_helper_bridge.cc b/components/arc/intent_helper/arc_intent_helper_bridge.cc |
index 7d3d3a280a4b8024870a5e2d26aaf9cc49cf7afb..b4519b5a5d2aa9157fcddb9343b4f78e08fa8e1f 100644 |
--- a/components/arc/intent_helper/arc_intent_helper_bridge.cc |
+++ b/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( |