| Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
|
| diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
|
| index aea7cc03a24d3c05d5255668372acf487a7aa102..6350b5209be831e1eb88accc5d5fdab4321d8398 100644
|
| --- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
|
| +++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h
|
| @@ -75,7 +75,7 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
|
| bool RemoveFromList(const std::string& setting,
|
| const base::Value& value) override;
|
| bool CommitTentativeDeviceSettings(
|
| - scoped_ptr<enterprise_management::PolicyData> policy) override;
|
| + std::unique_ptr<enterprise_management::PolicyData> policy) override;
|
|
|
| // NotificationObserver implementation:
|
| void Observe(int type,
|
| @@ -104,7 +104,7 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
|
|
|
| // Assembles PolicyData based on |settings|, |policy_data|, |user_id| and
|
| // |pending_management_settings|. Applies local-owner policy fixups if needed.
|
| - static scoped_ptr<enterprise_management::PolicyData> AssemblePolicy(
|
| + static std::unique_ptr<enterprise_management::PolicyData> AssemblePolicy(
|
| const std::string& user_id,
|
| const enterprise_management::PolicyData* policy_data,
|
| bool apply_pending_mangement_settings,
|
| @@ -152,7 +152,8 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
|
| // Called when current device settings are successfully signed.
|
| // Sends signed settings for storage.
|
| void OnPolicyAssembledAndSigned(
|
| - scoped_ptr<enterprise_management::PolicyFetchResponse> policy_response);
|
| + std::unique_ptr<enterprise_management::PolicyFetchResponse>
|
| + policy_response);
|
|
|
| // Called by DeviceSettingsService when modified and signed device
|
| // settings are stored.
|
| @@ -180,7 +181,8 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
|
| bool has_pending_fixups_;
|
|
|
| // A set of pending changes to device settings.
|
| - base::ScopedPtrHashMap<std::string, scoped_ptr<base::Value>> pending_changes_;
|
| + base::ScopedPtrHashMap<std::string, std::unique_ptr<base::Value>>
|
| + pending_changes_;
|
|
|
| // True if there're pending changes to management settings.
|
| bool has_pending_management_settings_;
|
| @@ -194,7 +196,7 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
|
| pending_management_settings_callbacks_;
|
|
|
| // A protobuf containing pending changes to device settings.
|
| - scoped_ptr<enterprise_management::ChromeDeviceSettingsProto>
|
| + std::unique_ptr<enterprise_management::ChromeDeviceSettingsProto>
|
| tentative_settings_;
|
|
|
| content::NotificationRegistrar registrar_;
|
|
|