arc: Revamp the ArcBridgeService interface

components/arc/ime/arc_ime_bridge_impl.h

Index: components/arc/ime/arc_ime_bridge_impl.h
diff --git a/components/arc/ime/arc_ime_bridge_impl.h b/components/arc/ime/arc_ime_bridge_impl.h
index a694ac3993d4b3c99b2271de58a9f916f2d1298f..f19f240b44d1ed23741f75dbed31c698138ea1af 100644
--- a/components/arc/ime/arc_ime_bridge_impl.h
+++ b/components/arc/ime/arc_ime_bridge_impl.h
@@ -10,6 +10,7 @@
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/common/ime.mojom.h"
 #include "components/arc/ime/arc_ime_bridge.h"
+#include "components/arc/instance_holder.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/gfx/geometry/rect.h"
@@ -24,13 +25,14 @@ namespace arc {
 // Chromium and the ARC container.
 class ArcImeBridgeImpl : public ArcImeBridge,
                          public mojom::ImeHost,
-                         public ArcBridgeService::Observer {
+                         public InstanceHolder<mojom::ImeInstance>::Observer {
  public:
   ArcImeBridgeImpl(Delegate* delegate, ArcBridgeService* bridge_service);
   ~ArcImeBridgeImpl() override;
 
-  // arc::ArcBridgeService::Observer overrides:
-  void OnImeInstanceReady() override;
+  // arc::InstanceHolder<mojom::ImeInstance>::Observer overrides:
+  void OnInstanceReady(mojom::ImeInstance* ime_instance,
+                       uint32_t version) override;
 
   // ArcImeBridge overrides:
   void SendSetCompositionText(const ui::CompositionText& composition) override;