arc: Revamp the ArcBridgeService interface

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 <vector>
 
 #include "base/bind.h"
@@ skipping 75 matching lines @@
                                     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();
+      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) {
+  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));
 
@@ skipping 62 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