| 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 70c9a5f1568779199c64fc9456193d2f25fcaa0c..8624acecf59be7d63e4cbbdd336cbe2717dd0ba8 100644
|
| --- a/chrome/browser/chromeos/arc/arc_policy_bridge.cc
|
| +++ b/chrome/browser/chromeos/arc/arc_policy_bridge.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <memory>
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "base/json/json_reader.h"
|
| #include "base/json/json_string_value_serializer.h"
|
| @@ -267,12 +268,8 @@ void ArcPolicyBridge::OnInstanceReady() {
|
| policy_service_->AddObserver(policy::POLICY_DOMAIN_CHROME, this);
|
|
|
| mojom::PolicyInstance* const policy_instance =
|
| - arc_bridge_service()->policy()->instance();
|
| - if (!policy_instance) {
|
| - LOG(ERROR) << "OnPolicyInstanceReady called, but no policy instance found";
|
| - return;
|
| - }
|
| -
|
| + arc_bridge_service()->policy()->GetInstanceForMethod("Init");
|
| + CHECK(policy_instance);
|
| policy_instance->Init(binding_.CreateInterfacePtrAndBind());
|
| }
|
|
|
| @@ -300,8 +297,11 @@ 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();
|
| + auto* instance =
|
| + arc_bridge_service()->policy()->GetInstanceForMethod("OnPolicyUpdated");
|
| + if (!instance)
|
| + return;
|
| + instance->OnPolicyUpdated();
|
| }
|
|
|
| void ArcPolicyBridge::InitializePolicyService() {
|
|
|