Consolidate 4 GetIntentHelper functions

chrome/browser/chromeos/arc/arc_navigation_throttle.cc

Index: chrome/browser/chromeos/arc/arc_navigation_throttle.cc
diff --git a/chrome/browser/chromeos/arc/arc_navigation_throttle.cc b/chrome/browser/chromeos/arc/arc_navigation_throttle.cc
index bb275cc60c8c32b44ed0b2e6f5cf6d563a6aa946..c3975e362460a688afa6c0acc96a2ba251fef98d 100644
--- a/chrome/browser/chromeos/arc/arc_navigation_throttle.cc
+++ b/chrome/browser/chromeos/arc/arc_navigation_throttle.cc
@@ -31,26 +31,6 @@ scoped_refptr<ActivityIconLoader> GetIconLoader() {
   return arc_service_manager ? arc_service_manager->icon_loader() : nullptr;
 }
 
-mojom::IntentHelperInstance* GetIntentHelper() {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  ArcBridgeService* bridge_service = ArcBridgeService::Get();
-  if (!bridge_service) {
-    VLOG(1) << "ARC bridge is not ready.";
-    return nullptr;
-  }
-  mojom::IntentHelperInstance* intent_helper_instance =
-      bridge_service->intent_helper()->instance();
-  if (!intent_helper_instance) {
-    VLOG(1) << "ARC intent helper instance is not ready.";
-    return nullptr;
-  }
-  if (bridge_service->intent_helper()->version() < kMinInstanceVersion) {
-    VLOG(1) << "ARC intent helper instance is too old.";
-    return nullptr;
-  }
-  return intent_helper_instance;
-}
-
 }  // namespace
 
 ArcNavigationThrottle::ArcNavigationThrottle(
@@ -131,7 +111,9 @@ ArcNavigationThrottle::HandleRequest() {
     return content::NavigationThrottle::PROCEED;
   }
 
-  mojom::IntentHelperInstance* bridge_instance = GetIntentHelper();
+  mojom::IntentHelperInstance* bridge_instance =
+      arc::ArcIntentHelperBridge::GetIntentHelperInstance(kMinInstanceVersion,
+                                                          nullptr);
   if (!bridge_instance)
     return content::NavigationThrottle::PROCEED;
   bridge_instance->RequestUrlHandlerList(
@@ -236,7 +218,9 @@ void ArcNavigationThrottle::OnIntentPickerClosed(
 
   previous_user_action_ = close_reason;
 
-  mojom::IntentHelperInstance* bridge = GetIntentHelper();
+  mojom::IntentHelperInstance* bridge =
+      arc::ArcIntentHelperBridge::GetIntentHelperInstance(kMinInstanceVersion,
+                                                          nullptr);
   if (!bridge || selected_app_index >= handlers.size()) {
     close_reason = CloseReason::ERROR;
   }