arc: Revamp the ArcBridgeService interface

components/arc/crash_collector/arc_crash_collector_bridge.h

Index: components/arc/crash_collector/arc_crash_collector_bridge.h
diff --git a/components/arc/crash_collector/arc_crash_collector_bridge.h b/components/arc/crash_collector/arc_crash_collector_bridge.h
index 4446bd34773c6164a70ba38a1113e241bc394c67..78476e3f663567c59442716981ac77cb16b8f90e 100644
--- a/components/arc/crash_collector/arc_crash_collector_bridge.h
+++ b/components/arc/crash_collector/arc_crash_collector_bridge.h
@@ -10,20 +10,24 @@
 #include "base/macros.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service.h"
+#include "components/arc/instance_holder.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace arc {
 
 // Relays dumps for non-native ARC crashes to the crash reporter in Chrome OS.
-class ArcCrashCollectorBridge : public ArcService,
-                                public ArcBridgeService::Observer,
-                                public mojom::CrashCollectorHost {
+class ArcCrashCollectorBridge
+    : public ArcService,
+      public InstanceHolder<mojom::CrashCollectorInstance>::Observer,
+      public mojom::CrashCollectorHost {
  public:
   explicit ArcCrashCollectorBridge(ArcBridgeService* bridge);
   ~ArcCrashCollectorBridge() override;
 
-  // ArcBridgeService::Observer overrides.
-  void OnCrashCollectorInstanceReady() override;
+  // InstanceHolder<mojom::CrashCollectorInstance>::Observer
+  // overrides.
+  void OnInstanceReady(mojom::CrashCollectorInstance* crash_collector_instance,
+                       uint32_t version) override;
 
   // mojom::CrashCollectorHost overrides.
   void DumpCrash(const mojo::String& type, mojo::ScopedHandle pipe) override;