arc: Revamp the ArcBridgeService interface

chrome/browser/chromeos/arc/arc_policy_bridge.cc

Index: chrome/browser/chromeos/arc/arc_policy_bridge.cc
diff --git a/chrome/browser/chromeos/arc/arc_policy_bridge.cc b/chrome/browser/chromeos/arc/arc_policy_bridge.cc
index a9dff1dd7148faf9e87b76751cd7c2ec5d28cfc2..e15439822ffd20cb062be3391af0ca35fa8ec1f5 100644
--- a/chrome/browser/chromeos/arc/arc_policy_bridge.cc
+++ b/chrome/browser/chromeos/arc/arc_policy_bridge.cc
@@ -235,7 +235,7 @@ std::string GetFilteredJSONPolicies(const policy::PolicyMap& policy_map) {
 ArcPolicyBridge::ArcPolicyBridge(ArcBridgeService* bridge_service)
     : ArcService(bridge_service), binding_(this) {
   VLOG(2) << "ArcPolicyBridge::ArcPolicyBridge";
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->policy()->AddObserver(this);
 }
 
 ArcPolicyBridge::ArcPolicyBridge(ArcBridgeService* bridge_service,
@@ -244,19 +244,19 @@ ArcPolicyBridge::ArcPolicyBridge(ArcBridgeService* bridge_service,
       binding_(this),
       policy_service_(policy_service) {
   VLOG(2) << "ArcPolicyBridge::ArcPolicyBridge(bridge_service, policy_service)";
-  arc_bridge_service()->AddObserver(this);
+  arc_bridge_service()->policy()->AddObserver(this);
 }
 
 ArcPolicyBridge::~ArcPolicyBridge() {
   VLOG(2) << "ArcPolicyBridge::~ArcPolicyBridge";
-  arc_bridge_service()->RemoveObserver(this);
+  arc_bridge_service()->policy()->RemoveObserver(this);
 }
 
 void ArcPolicyBridge::OverrideIsManagedForTesting(bool is_managed) {
   is_managed_ = is_managed;
 }
 
-void ArcPolicyBridge::OnPolicyInstanceReady() {
+void ArcPolicyBridge::OnInstanceReady() {
   VLOG(1) << "ArcPolicyBridge::OnPolicyInstanceReady";
   if (policy_service_ == nullptr) {
     InitializePolicyService();
@@ -264,7 +264,7 @@ void ArcPolicyBridge::OnPolicyInstanceReady() {
   policy_service_->AddObserver(policy::POLICY_DOMAIN_CHROME, this);
 
   mojom::PolicyInstance* const policy_instance =
-      arc_bridge_service()->policy_instance();
+      arc_bridge_service()->policy()->instance();
   if (!policy_instance) {
     LOG(ERROR) << "OnPolicyInstanceReady called, but no policy instance found";
     return;
@@ -273,7 +273,7 @@ void ArcPolicyBridge::OnPolicyInstanceReady() {
   policy_instance->Init(binding_.CreateInterfacePtrAndBind());
 }
 
-void ArcPolicyBridge::OnPolicyInstanceClosed() {
+void ArcPolicyBridge::OnInstanceClosed() {
   VLOG(1) << "ArcPolicyBridge::OnPolicyInstanceClosed";
   policy_service_->RemoveObserver(policy::POLICY_DOMAIN_CHROME, this);
   policy_service_ = nullptr;
@@ -297,8 +297,8 @@ void ArcPolicyBridge::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                       const policy::PolicyMap& previous,
                                       const policy::PolicyMap& current) {
   VLOG(1) << "ArcPolicyBridge::OnPolicyUpdated";
-  DCHECK(arc_bridge_service()->policy_instance());
-  arc_bridge_service()->policy_instance()->OnPolicyUpdated();
+  DCHECK(arc_bridge_service()->policy()->instance());
+  arc_bridge_service()->policy()->instance()->OnPolicyUpdated();
 }
 
 void ArcPolicyBridge::InitializePolicyService() {