| Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h
|
| diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h
|
| index c19588d67b8099ddd9507e6c1403ef2f04ea832a..5a110473916f865c761ca43042a5e860b8d02268 100644
|
| --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h
|
| +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h
|
| @@ -5,13 +5,13 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_MANAGER_CHROMEOS_H_
|
| #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_MANAGER_CHROMEOS_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "base/timer/timer.h"
|
| #include "components/keyed_service/core/keyed_service.h"
|
| @@ -53,8 +53,8 @@ class UserCloudPolicyManagerChromeOS : public CloudPolicyManager,
|
| // |io_task_runner| is used for network IO. Currently this must be the IO
|
| // BrowserThread.
|
| UserCloudPolicyManagerChromeOS(
|
| - scoped_ptr<CloudPolicyStore> store,
|
| - scoped_ptr<CloudExternalDataManager> external_data_manager,
|
| + std::unique_ptr<CloudPolicyStore> store,
|
| + std::unique_ptr<CloudExternalDataManager> external_data_manager,
|
| const base::FilePath& component_policy_cache_path,
|
| bool wait_for_policy_fetch,
|
| base::TimeDelta initial_policy_fetch_timeout,
|
| @@ -140,10 +140,10 @@ class UserCloudPolicyManagerChromeOS : public CloudPolicyManager,
|
| void StartRefreshSchedulerIfReady();
|
|
|
| // Owns the store, note that CloudPolicyManager just keeps a plain pointer.
|
| - scoped_ptr<CloudPolicyStore> store_;
|
| + std::unique_ptr<CloudPolicyStore> store_;
|
|
|
| // Manages external data referenced by policies.
|
| - scoped_ptr<CloudExternalDataManager> external_data_manager_;
|
| + std::unique_ptr<CloudExternalDataManager> external_data_manager_;
|
|
|
| // Username for the wildcard login check if applicable, empty otherwise.
|
| std::string wildcard_username_;
|
| @@ -169,10 +169,10 @@ class UserCloudPolicyManagerChromeOS : public CloudPolicyManager,
|
|
|
| // Used to fetch the policy OAuth token, when necessary. This object holds
|
| // a callback with an unretained reference to the manager, when it exists.
|
| - scoped_ptr<PolicyOAuth2TokenFetcher> token_fetcher_;
|
| + std::unique_ptr<PolicyOAuth2TokenFetcher> token_fetcher_;
|
|
|
| // Keeps alive the wildcard checker while its running.
|
| - scoped_ptr<WildcardLoginChecker> wildcard_login_checker_;
|
| + std::unique_ptr<WildcardLoginChecker> wildcard_login_checker_;
|
|
|
| // The access token passed to OnAccessTokenAvailable. It is stored here so
|
| // that it can be used if OnInitializationCompleted is called later.
|
|
|