Consolidate 4 GetIntentHelper functions

components/arc/intent_helper/link_handler_model_impl.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/link_handler_model_impl.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 38 matching lines @@
 
 }  // namespace
 
 LinkHandlerModelImpl::LinkHandlerModelImpl(
     scoped_refptr<ActivityIconLoader> icon_loader)
     : icon_loader_(icon_loader), weak_ptr_factory_(this) {}
 
 LinkHandlerModelImpl::~LinkHandlerModelImpl() {}
 
 bool LinkHandlerModelImpl::Init(const GURL& url) {
-  mojom::IntentHelperInstance* intent_helper_instance = GetIntentHelper();
+  mojom::IntentHelperInstance* intent_helper_instance =
+      ArcIntentHelperBridge::GetIntentHelperInstance(kMinInstanceVersion,
+                                                     nullptr);
   if (!intent_helper_instance)
     return false;
 
   // Check if ARC apps can handle the |url|. Since the information is held in
   // a different (ARC) process, issue a mojo IPC request. Usually, the
   // callback function, OnUrlHandlerList, is called within a few milliseconds
   // even on the slowest Chromebook we support.
   const GURL rewritten(RewriteUrlFromQueryIfAvailable(url));
   intent_helper_instance->RequestUrlHandlerList(
       rewritten.spec(), base::Bind(&LinkHandlerModelImpl::OnUrlHandlerList,
                                    weak_ptr_factory_.GetWeakPtr()));
   return true;
 }
 
 void LinkHandlerModelImpl::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void LinkHandlerModelImpl::OpenLinkWithHandler(const GURL& url,
                                                uint32_t handler_id) {
-  mojom::IntentHelperInstance* intent_helper_instance = GetIntentHelper();
+  mojom::IntentHelperInstance* intent_helper_instance =
+      ArcIntentHelperBridge::GetIntentHelperInstance(kMinInstanceVersion,
+                                                     nullptr);
   if (!intent_helper_instance)
     return;
   if (handler_id >= handlers_.size())
     return;
   const GURL rewritten(RewriteUrlFromQueryIfAvailable(url));
   intent_helper_instance->HandleUrl(rewritten.spec(),
                                     handlers_[handler_id]->package_name);
 }
 
-mojom::IntentHelperInstance* LinkHandlerModelImpl::GetIntentHelper() {
-  ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();
-  if (!bridge_service) {
-    DLOG(WARNING) << "ARC bridge is not ready.";
-    return nullptr;
-  }
-  mojom::IntentHelperInstance* intent_helper_instance =
-      bridge_service->intent_helper()->instance();
-  if (!intent_helper_instance) {
-    DLOG(WARNING) << "ARC intent helper instance is not ready.";
-    return nullptr;
-  }
-  if (bridge_service->intent_helper()->version() < kMinInstanceVersion) {
-    DLOG(WARNING) << "ARC intent helper instance is too old.";
-    return nullptr;
-  }
-  return intent_helper_instance;
-}
-
 void LinkHandlerModelImpl::OnUrlHandlerList(
     mojo::Array<mojom::UrlHandlerInfoPtr> handlers) {
   handlers_ = ArcIntentHelperBridge::FilterOutIntentHelper(std::move(handlers));
 
   bool icon_info_notified = false;
   if (icon_loader_) {
     std::vector<ActivityIconLoader::ActivityName> activities;
     for (size_t i = 0; i < handlers_.size(); ++i) {
       activities.emplace_back(handlers_[i]->package_name,
                               handlers_[i]->activity_name);
@@ skipping 56 matching lines @@
   if (!GetQueryValue(url, kKeyToFind, &value))
     return url;
 
   const GURL new_url(value);
   if (!new_url.is_valid())
     return url;
   return new_url;
 }
 
 }  // namespace arc