| Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h
|
| diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h
|
| index 9155891788a870063b5eb4b92864e6171463082d..2be1a0d73119b766f6686fc7f09290b99e08599c 100644
|
| --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h
|
| +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h
|
| @@ -6,10 +6,10 @@
|
| #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_MANAGER_FACTORY_CHROMEOS_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/singleton.h"
|
| #include "components/keyed_service/content/browser_context_keyed_base_factory.h"
|
|
|
| @@ -57,7 +57,7 @@ class UserCloudPolicyManagerFactoryChromeOS
|
| //
|
| // If |force_immediate_load| is true, policy is loaded synchronously from
|
| // UserCloudPolicyStore at startup.
|
| - static scoped_ptr<UserCloudPolicyManagerChromeOS> CreateForProfile(
|
| + static std::unique_ptr<UserCloudPolicyManagerChromeOS> CreateForProfile(
|
| Profile* profile,
|
| bool force_immediate_load,
|
| scoped_refptr<base::SequencedTaskRunner> background_task_runner);
|
| @@ -71,7 +71,7 @@ class UserCloudPolicyManagerFactoryChromeOS
|
|
|
| // See comments for the static versions above.
|
| UserCloudPolicyManagerChromeOS* GetManagerForProfile(Profile* profile);
|
| - scoped_ptr<UserCloudPolicyManagerChromeOS> CreateManagerForProfile(
|
| + std::unique_ptr<UserCloudPolicyManagerChromeOS> CreateManagerForProfile(
|
| Profile* profile,
|
| bool force_immediate_load,
|
| scoped_refptr<base::SequencedTaskRunner> background_task_runner);
|
|
|