Added a PolicyDomainDescriptor.

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/message_loop.h"
 #include "base/message_loop/message_loop_proxy.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 "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace policy {
 
 AsyncPolicyProvider::AsyncPolicyProvider(scoped_ptr<AsyncPolicyLoader> loader)
     : loader_(loader.release()),
       weak_factory_(this) {
   // Make an immediate synchronous load on startup.
@@ skipping 49 matching lines @@
   // made before this call. So if a caller has modified the policy settings and
   // invoked RefreshPolicies(), then by the next notification these policies
   // should already be provided.
   // However, it's also possible that an asynchronous Reload() is in progress
   // and just posted OnLoaderReloaded(). Therefore a task is posted to the
   // FILE thread before posting the next Reload, to prevent a potential
   // concurrent Reload() from triggering a notification too early. If another
   // refresh task has been posted, it is invalidated now.
   refresh_callback_.Reset(
       base::Bind(&AsyncPolicyProvider::ReloadAfterRefreshSync,
-                 base::Unretained(this)));
+                 weak_factory_.GetWeakPtr()));
   BrowserThread::PostTaskAndReply(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(base::DoNothing),
       refresh_callback_.callback());
 }
 
+void AsyncPolicyProvider::RegisterPolicyDomain(
+    scoped_refptr<const PolicyDomainDescriptor> descriptor) {
+  if (loader_) {
+    BrowserThread::PostTask(BrowserThread::FILE,
+                            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();
@@ skipping 22 matching lines @@
     base::WeakPtr<AsyncPolicyProvider> weak_this,
     scoped_ptr<PolicyBundle> bundle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   loop->PostTask(FROM_HERE,
                  base::Bind(&AsyncPolicyProvider::OnLoaderReloaded,
                             weak_this,
                             base::Passed(&bundle)));
 }
 
 }  // namespace policy