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

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"
 
 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() {
   DCHECK(CalledOnValidThread());
   // Shutdown() must have been called before.
   DCHECK(!loader_);
 }
 
+void AsyncPolicyProvider::InitialLoad() {
+  OnLoaderReloaded(loader_->InitialLoad());
+}
+
 void AsyncPolicyProvider::Init() {
   DCHECK(CalledOnValidThread());
   ConfigurationPolicyProvider::Init();
 
   if (!loader_)
     return;
 
   AsyncPolicyLoader::UpdateCallback callback =
       base::Bind(&AsyncPolicyProvider::LoaderUpdateCallback,
                  base::MessageLoopProxy::current(),
@@ skipping 40 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::InitialRegisterPolicyDomain(
+    scoped_refptr<const PolicyDomainDescriptor> descriptor) {
+  if (loader_)
+    loader_->InitialRegisterPolicyDomain(descriptor);
+}
+
 void AsyncPolicyProvider::RegisterPolicyDomain(
     scoped_refptr<const PolicyDomainDescriptor> descriptor) {
   if (loader_) {
     loader_->task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&AsyncPolicyLoader::RegisterPolicyDomain,
                    base::Unretained(loader_),
                    descriptor));
   }
 }
@@ skipping 31 matching lines @@
     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