Use ARC_GET_INSTANCE_FOR_METHOD for getting intent_helper instance

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 "base/bind.h"
 #include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_service_manager.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/google/core/browser/google_util.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
 namespace arc {
 
 namespace {
 
-constexpr int kMinInstanceVersion = 2;  // see intent_helper.mojom
 constexpr int kMaxValueLen = 2048;
 
 bool GetQueryValue(const GURL& url,
                    const std::string& key_to_find,
                    base::string16* out) {
   const std::string str(url.query());
 
   url::Component query(0, str.length());
   url::Component key;
   url::Component value;
@@ skipping 16 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) {
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "RequestUrlHandlerList", kMinInstanceVersion);
+  auto* arc_service_manager = ArcServiceManager::Get();
+  if (!arc_service_manager)
+    return false;
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_service_manager->arc_bridge_service()->intent_helper(),
+      RequestUrlHandlerList);
   if (!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));
   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) {
-  auto* instance = ArcIntentHelperBridge::GetIntentHelperInstance(
-      "HandleUrl", kMinInstanceVersion);
+  auto* arc_service_manager = ArcServiceManager::Get();
+  if (!arc_service_manager)
+    return;
+  auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
+      arc_service_manager->arc_bridge_service()->intent_helper(), HandleUrl);
   if (!instance)
     return;
   if (handler_id >= handlers_.size())
     return;
   const GURL rewritten(RewriteUrlFromQueryIfAvailable(url));
   instance->HandleUrl(rewritten.spec(), handlers_[handler_id]->package_name);
 }
 
 void LinkHandlerModelImpl::OnUrlHandlerList(
     std::vector<mojom::IntentHandlerInfoPtr> handlers) {
@@ skipping 65 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