Consolidate 4 GetIntentHelper functions

chrome/browser/chromeos/arc/arc_navigation_throttle.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 "chrome/browser/chromeos/arc/arc_navigation_throttle.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 namespace {
 
 constexpr int kMinInstanceVersion = 7;
 
 scoped_refptr<ActivityIconLoader> GetIconLoader() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ArcServiceManager* arc_service_manager = ArcServiceManager::Get();
   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(
     content::NavigationHandle* navigation_handle,
     const ShowIntentPickerCallback& show_intent_picker_cb)
     : content::NavigationThrottle(navigation_handle),
       show_intent_picker_callback_(show_intent_picker_cb),
       previous_user_action_(CloseReason::INVALID),
       weak_ptr_factory_(this) {}
 
@@ skipping 60 matching lines @@
   arc::ArcServiceManager* arc_service_manager = arc::ArcServiceManager::Get();
   DCHECK(arc_service_manager);
   scoped_refptr<arc::LocalActivityResolver> local_resolver =
       arc_service_manager->activity_resolver();
   if (local_resolver->ShouldChromeHandleUrl(url)) {
     // Allow navigation to proceed if there isn't an android app that handles
     // the given URL.
     return content::NavigationThrottle::PROCEED;
   }
 
-  mojom::IntentHelperInstance* bridge_instance = GetIntentHelper();
+  mojom::IntentHelperInstance* bridge_instance =
+      arc::ArcIntentHelperBridge::GetIntentHelperInstance(kMinInstanceVersion);
   if (!bridge_instance)
     return content::NavigationThrottle::PROCEED;
   bridge_instance->RequestUrlHandlerList(
       url.spec(), base::Bind(&ArcNavigationThrottle::OnAppCandidatesReceived,
                              weak_ptr_factory_.GetWeakPtr()));
   return content::NavigationThrottle::DEFER;
 }
 
 // We received the array of app candidates to handle this URL (even the Chrome
 // app is included).
@@ skipping 84 matching lines @@
 void ArcNavigationThrottle::OnIntentPickerClosed(
     mojo::Array<mojom::UrlHandlerInfoPtr> handlers,
     size_t selected_app_index,
     CloseReason close_reason) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   const GURL& url = navigation_handle()->GetURL();
   content::NavigationHandle* handle = navigation_handle();
 
   previous_user_action_ = close_reason;
 
-  mojom::IntentHelperInstance* bridge = GetIntentHelper();
+  mojom::IntentHelperInstance* bridge =
+      arc::ArcIntentHelperBridge::GetIntentHelperInstance(kMinInstanceVersion);
   if (!bridge || selected_app_index >= handlers.size()) {
     close_reason = CloseReason::ERROR;
   }
 
   switch (close_reason) {
     case CloseReason::ERROR:
     case CloseReason::DIALOG_DEACTIVATED: {
       // If the user fails to select an option from the list, or the UI returned
       // an error or if |selected_app_index| is not a valid index, then resume
       // the navigation in Chrome.
@@ skipping 32 matching lines @@
 bool ArcNavigationThrottle::ShouldOverrideUrlLoading(
     content::NavigationHandle* navigation_handle) {
   GURL previous_url = navigation_handle->GetReferrer().url;
   GURL current_url = navigation_handle->GetURL();
   return !net::registry_controlled_domains::SameDomainOrHost(
       current_url, previous_url,
       net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
 }
 
 }  // namespace arc