Policy providers all get a SchemaRegistry to work with.

chrome/browser/policy/async_policy_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/async_policy_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/policy/async_policy_loader.h"
 #include "chrome/browser/policy/policy_bundle.h"
-#include "chrome/browser/policy/policy_domain_descriptor.h"
+#include "chrome/browser/policy/schema_registry.h"
 
 namespace policy {
 
-AsyncPolicyProvider::AsyncPolicyProvider(scoped_ptr<AsyncPolicyLoader> loader)
+AsyncPolicyProvider::AsyncPolicyProvider(
+    SchemaRegistry* registry,
+    scoped_ptr<AsyncPolicyLoader> loader)
     : loader_(loader.release()),
       weak_factory_(this) {
   // Make an immediate synchronous load on startup.
-  OnLoaderReloaded(loader_->InitialLoad());
+  OnLoaderReloaded(loader_->InitialLoad(registry->schema_map()));
 }
 
 AsyncPolicyProvider::~AsyncPolicyProvider() {
   DCHECK(CalledOnValidThread());
   // Shutdown() must have been called before.
   DCHECK(!loader_);
 }
 
-void AsyncPolicyProvider::Init() {
+void AsyncPolicyProvider::Init(SchemaRegistry* registry) {
   DCHECK(CalledOnValidThread());
-  ConfigurationPolicyProvider::Init();
+  ConfigurationPolicyProvider::Init(registry);
 
   if (!loader_)
     return;
 
   AsyncPolicyLoader::UpdateCallback callback =
       base::Bind(&AsyncPolicyProvider::LoaderUpdateCallback,
                  base::MessageLoopProxy::current(),
                  weak_factory_.GetWeakPtr());
   bool post = loader_->task_runner()->PostTask(
       FROM_HERE,
@@ skipping 37 matching lines @@
     return;
   refresh_callback_.Reset(
       base::Bind(&AsyncPolicyProvider::ReloadAfterRefreshSync,
                  weak_factory_.GetWeakPtr()));
   loader_->task_runner()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(base::DoNothing),
       refresh_callback_.callback());
 }
 
-void AsyncPolicyProvider::RegisterPolicyDomain(
-    scoped_refptr<const PolicyDomainDescriptor> descriptor) {
-  if (loader_) {
-    loader_->task_runner()->PostTask(
-        FROM_HERE,
-        base::Bind(&AsyncPolicyLoader::RegisterPolicyDomain,
-                   base::Unretained(loader_),
-                   descriptor));
-  }
-}
-
 void AsyncPolicyProvider::ReloadAfterRefreshSync() {
   DCHECK(CalledOnValidThread());
   // This task can only enter if it was posted from RefreshPolicies(), and it
   // hasn't been cancelled meanwhile by another call to RefreshPolicies().
   DCHECK(!refresh_callback_.IsCancelled());
   // There can't be another refresh callback pending now, since its creation
   // in RefreshPolicies() would have cancelled the current execution. So it's
   // safe to cancel the |refresh_callback_| now, so that OnLoaderReloaded()
   // sees that there is no refresh pending.
   refresh_callback_.Cancel();
 
   if (!loader_)
     return;
 
-  loader_->task_runner()->PostTask(FROM_HERE,
-                                   base::Bind(&AsyncPolicyLoader::Reload,
-                                              base::Unretained(loader_),
-                                              true /* force */));
+  loader_->task_runner()->PostTask(
+      FROM_HERE,
+      base::Bind(&AsyncPolicyLoader::RefreshPolicies,
+                 base::Unretained(loader_),
+                 schema_map()));
 }
 
 void AsyncPolicyProvider::OnLoaderReloaded(scoped_ptr<PolicyBundle> bundle) {
   DCHECK(CalledOnValidThread());
   // Only propagate policy updates if there are no pending refreshes, and if
   // Shutdown() hasn't been called yet.
   if (refresh_callback_.IsCancelled() && loader_)
     UpdatePolicy(bundle.Pass());
 }
 
 // static
 void AsyncPolicyProvider::LoaderUpdateCallback(
     scoped_refptr<base::MessageLoopProxy> loop,
     base::WeakPtr<AsyncPolicyProvider> weak_this,
     scoped_ptr<PolicyBundle> bundle) {
   loop->PostTask(FROM_HERE,
                  base::Bind(&AsyncPolicyProvider::OnLoaderReloaded,
                             weak_this,
                             base::Passed(&bundle)));
 }
 
 }  // namespace policy