arc: Revamp the ArcBridgeService interface

components/arc/intent_helper/arc_intent_helper_bridge.h

Index: components/arc/intent_helper/arc_intent_helper_bridge.h
diff --git a/components/arc/intent_helper/arc_intent_helper_bridge.h b/components/arc/intent_helper/arc_intent_helper_bridge.h
index 4adbe472bf057bdce5fafa37a08932c4d1888a84..14cdfa6727765bd812092d7450414f04859e7a10 100644
--- a/components/arc/intent_helper/arc_intent_helper_bridge.h
+++ b/components/arc/intent_helper/arc_intent_helper_bridge.h
@@ -15,6 +15,7 @@
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service.h"
 #include "components/arc/common/intent_helper.mojom.h"
+#include "components/arc/instance_holder.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace ash {
@@ -30,10 +31,11 @@ class LocalActivityResolver;
 class SetWallpaperDelegate;
 
 // Receives intents from ARC.
-class ArcIntentHelperBridge : public ArcService,
-                              public ArcBridgeService::Observer,
-                              public mojom::IntentHelperHost,
-                              public ash::LinkHandlerModelFactory {
+class ArcIntentHelperBridge
+    : public ArcService,
+      public InstanceHolder<mojom::IntentHelperInstance>::Observer,
+      public mojom::IntentHelperHost,
+      public ash::LinkHandlerModelFactory {
  public:
   ArcIntentHelperBridge(
       ArcBridgeService* bridge_service,
@@ -42,9 +44,10 @@ class ArcIntentHelperBridge : public ArcService,
       const scoped_refptr<LocalActivityResolver>& activity_resolver);
   ~ArcIntentHelperBridge() override;
 
-  // ArcBridgeService::Observer
-  void OnIntentHelperInstanceReady() override;
-  void OnIntentHelperInstanceClosed() override;
+  // InstanceHolder<mojom::IntentHelperInstance>::Observer
+  void OnInstanceReady(mojom::IntentHelperInstance* intent_helper_instance,
+                       uint32_t version) override;
+  void OnInstanceClosed(mojom::IntentHelperInstance*) override;
 
   // arc::mojom::IntentHelperHost
   void OnIconInvalidated(const mojo::String& package_name) override;