arc: Revamp the ArcBridgeService interface

components/arc/intent_helper/arc_intent_helper_bridge.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/arc_intent_helper_bridge.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/shell_delegate.h"
@@ skipping 21 matching lines @@
     ArcBridgeService* bridge_service,
     const scoped_refptr<ActivityIconLoader>& icon_loader,
     std::unique_ptr<SetWallpaperDelegate> set_wallpaper_delegate,
     const scoped_refptr<LocalActivityResolver>& activity_resolver)
     : ArcService(bridge_service),
       binding_(this),
       icon_loader_(icon_loader),
       set_wallpaper_delegate_(std::move(set_wallpaper_delegate)),
       activity_resolver_(activity_resolver) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->intent_helper()->AddObserver(this);
 }
 
 ArcIntentHelperBridge::~ArcIntentHelperBridge() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  arc_bridge_service()->RemoveObserver(this);
+  arc_bridge_service()->intent_helper()->RemoveObserver(this);
 }
 
-void ArcIntentHelperBridge::OnIntentHelperInstanceReady() {
+void ArcIntentHelperBridge::OnInstanceReady() {
   DCHECK(thread_checker_.CalledOnValidThread());
   ash::Shell::GetInstance()->set_link_handler_model_factory(this);
-  arc_bridge_service()->intent_helper_instance()->Init(
+  arc_bridge_service()->intent_helper()->instance()->Init(
       binding_.CreateInterfacePtrAndBind());
 }
 
-void ArcIntentHelperBridge::OnIntentHelperInstanceClosed() {
+void ArcIntentHelperBridge::OnInstanceClosed() {
   DCHECK(thread_checker_.CalledOnValidThread());
   ash::Shell::GetInstance()->set_link_handler_model_factory(nullptr);
 }
 
 void ArcIntentHelperBridge::OnIconInvalidated(
     const mojo::String& package_name) {
   DCHECK(thread_checker_.CalledOnValidThread());
   icon_loader_->InvalidateIcons(package_name);
 }
 
@@ skipping 51 matching lines @@
   return handlers_filtered;
 }
 
 void ArcIntentHelperBridge::OnIntentFiltersUpdated(
     mojo::Array<mojom::IntentFilterPtr> filters) {
   DCHECK(thread_checker_.CalledOnValidThread());
   activity_resolver_->UpdateIntentFilters(std::move(filters));
 }
 
 }  // namespace arc