Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: chrome/browser/chromeos/arc/arc_policy_bridge.cc

Issue 2357053002: Always use arc::InstanceHolder<T>::GetInstanceForMethod (Closed)
Patch Set: review Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..4b287f578f857620d831f5b0e5449463b77e5271 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,9 @@ 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";
+ arc_bridge_service()->policy()->GetInstanceForMethod("Init");
+ if (!policy_instance)
return;
- }
-
policy_instance->Init(binding_.CreateInterfacePtrAndBind());
}
@@ -300,8 +298,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() {

Powered by Google App Engine
This is Rietveld 408576698