arc: Revamp the ArcBridgeService interface

components/arc/test/fake_policy_instance.h

Index: components/arc/test/fake_policy_instance.h
diff --git a/components/arc/test/fake_policy_instance.h b/components/arc/test/fake_policy_instance.h
index 213f3d39216a0e4c943e696c62c5c8cc83a72495..47ed41117f867e0dab4b9c38b219cde2464e99f3 100644
--- a/components/arc/test/fake_policy_instance.h
+++ b/components/arc/test/fake_policy_instance.h
@@ -11,8 +11,9 @@
 
 namespace arc {
 
-class FakePolicyInstance : public mojom::PolicyInstance,
-                           public arc::ArcBridgeService::Observer {
+class FakePolicyInstance
+    : public mojom::PolicyInstance,
+      public arc::ArcBridgeService::InstanceObserver<mojom::PolicyInstance> {
  public:
   // bridge_service should not be destroyed before the destructor is called.
   FakePolicyInstance(mojo::InterfaceRequest<mojom::PolicyInstance> request,
@@ -23,8 +24,8 @@ class FakePolicyInstance : public mojom::PolicyInstance,
   void Init(mojom::PolicyHostPtr host_ptr) override;
   void OnPolicyUpdated() override;
 
-  // arc::ArcBridgeService::Observer
-  void OnPolicyInstanceReady() override;
+  // arc::ArcBridgeService::InstanceObserver<mojom::PolicyInstance>
+  void OnInstanceReady(mojom::PolicyInstance*, uint32_t version) override;
 
   void WaitForOnPolicyInstanceReady();
   void CallGetPolicies(const mojom::PolicyHost::GetPoliciesCallback& callback);