| Index: components/policy/core/common/async_policy_provider.cc
|
| diff --git a/components/policy/core/common/async_policy_provider.cc b/components/policy/core/common/async_policy_provider.cc
|
| index 80e1be8401fd08756488305c91e2e22d973cd864..e9465e5534bf3736218957f34624bbeafb98de3c 100644
|
| --- a/components/policy/core/common/async_policy_provider.cc
|
| +++ b/components/policy/core/common/async_policy_provider.cc
|
| @@ -18,8 +18,9 @@
|
|
|
| namespace policy {
|
|
|
| -AsyncPolicyProvider::AsyncPolicyProvider(SchemaRegistry* registry,
|
| - scoped_ptr<AsyncPolicyLoader> loader)
|
| +AsyncPolicyProvider::AsyncPolicyProvider(
|
| + SchemaRegistry* registry,
|
| + std::unique_ptr<AsyncPolicyLoader> loader)
|
| : loader_(std::move(loader)), weak_factory_(this) {
|
| // Make an immediate synchronous load on startup.
|
| OnLoaderReloaded(loader_->InitialLoad(registry->schema_map()));
|
| @@ -110,7 +111,8 @@ void AsyncPolicyProvider::ReloadAfterRefreshSync() {
|
| schema_map()));
|
| }
|
|
|
| -void AsyncPolicyProvider::OnLoaderReloaded(scoped_ptr<PolicyBundle> bundle) {
|
| +void AsyncPolicyProvider::OnLoaderReloaded(
|
| + std::unique_ptr<PolicyBundle> bundle) {
|
| DCHECK(CalledOnValidThread());
|
| // Only propagate policy updates if there are no pending refreshes, and if
|
| // Shutdown() hasn't been called yet.
|
| @@ -122,7 +124,7 @@ void AsyncPolicyProvider::OnLoaderReloaded(scoped_ptr<PolicyBundle> bundle) {
|
| void AsyncPolicyProvider::LoaderUpdateCallback(
|
| scoped_refptr<base::SingleThreadTaskRunner> runner,
|
| base::WeakPtr<AsyncPolicyProvider> weak_this,
|
| - scoped_ptr<PolicyBundle> bundle) {
|
| + std::unique_ptr<PolicyBundle> bundle) {
|
| runner->PostTask(FROM_HERE,
|
| base::Bind(&AsyncPolicyProvider::OnLoaderReloaded,
|
| weak_this,
|
|
|