| Index: components/policy/core/browser/configuration_policy_handler_list.h
|
| diff --git a/components/policy/core/browser/configuration_policy_handler_list.h b/components/policy/core/browser/configuration_policy_handler_list.h
|
| index 69ebff93e19fdb5189d410d80795ecc16edb7612..a130e6fc50077bedd132f3fa31a1372a849ba134 100644
|
| --- a/components/policy/core/browser/configuration_policy_handler_list.h
|
| +++ b/components/policy/core/browser/configuration_policy_handler_list.h
|
| @@ -5,11 +5,11 @@
|
| #ifndef COMPONENTS_POLICY_CORE_BROWSER_CONFIGURATION_POLICY_HANDLER_LIST_H_
|
| #define COMPONENTS_POLICY_CORE_BROWSER_CONFIGURATION_POLICY_HANDLER_LIST_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "components/policy/core/common/policy_details.h"
|
| #include "components/policy/policy_export.h"
|
|
|
| @@ -38,7 +38,7 @@ class POLICY_EXPORT ConfigurationPolicyHandlerList {
|
| ~ConfigurationPolicyHandlerList();
|
|
|
| // Adds a policy handler to the list.
|
| - void AddHandler(scoped_ptr<ConfigurationPolicyHandler> handler);
|
| + void AddHandler(std::unique_ptr<ConfigurationPolicyHandler> handler);
|
|
|
| // Translates |policies| to their corresponding preferences in |prefs|.
|
| // Any errors found while processing the policies are stored in |errors|.
|
| @@ -60,8 +60,9 @@ class POLICY_EXPORT ConfigurationPolicyHandlerList {
|
|
|
| // Callback with signature of BuildHandlerList(), to be used in constructor of
|
| // BrowserPolicyConnector.
|
| -typedef base::Callback<scoped_ptr<ConfigurationPolicyHandlerList>(
|
| - const Schema&)> HandlerListFactory;
|
| +typedef base::Callback<std::unique_ptr<ConfigurationPolicyHandlerList>(
|
| + const Schema&)>
|
| + HandlerListFactory;
|
|
|
| } // namespace policy
|
|
|
|
|