policy: load JSON schema into domain descriptor at start time.

chrome/browser/policy/async_policy_provider.cc

Index: chrome/browser/policy/async_policy_provider.cc
diff --git a/chrome/browser/policy/async_policy_provider.cc b/chrome/browser/policy/async_policy_provider.cc
index f5644820ff62de27c863412148a979656c373ae7..791b70ff148c475aefea67ce45008a4910800967 100644
--- a/chrome/browser/policy/async_policy_provider.cc
+++ b/chrome/browser/policy/async_policy_provider.cc
@@ -19,8 +19,6 @@ namespace policy {
 AsyncPolicyProvider::AsyncPolicyProvider(scoped_ptr<AsyncPolicyLoader> loader)
     : loader_(loader.release()),
       weak_factory_(this) {
-  // Make an immediate synchronous load on startup.
-  OnLoaderReloaded(loader_->InitialLoad());
 }
 
 AsyncPolicyProvider::~AsyncPolicyProvider() {
@@ -29,6 +27,10 @@ AsyncPolicyProvider::~AsyncPolicyProvider() {
   DCHECK(!loader_);
 }
 
+void AsyncPolicyProvider::InitialLoad() {
+  OnLoaderReloaded(loader_->InitialLoad());
+}
+
 void AsyncPolicyProvider::Init() {
   DCHECK(CalledOnValidThread());
   ConfigurationPolicyProvider::Init();
@@ -89,6 +91,12 @@ void AsyncPolicyProvider::RefreshPolicies() {
       refresh_callback_.callback());
 }
 
+void AsyncPolicyProvider::InitialRegisterPolicyDomain(
+    scoped_refptr<const PolicyDomainDescriptor> descriptor) {
+  if (loader_)
+    loader_->InitialRegisterPolicyDomain(descriptor);
+}
+
 void AsyncPolicyProvider::RegisterPolicyDomain(
     scoped_refptr<const PolicyDomainDescriptor> descriptor) {
   if (loader_) {