| Index: chrome/browser/extensions/extension_management.cc
|
| diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
|
| index c3efdcb3346656d7e4f59f3c267f0ccba0a53296..ab812b3c041323f6169e67a92eff3ac6fd3bd9b7 100644
|
| --- a/chrome/browser/extensions/extension_management.cc
|
| +++ b/chrome/browser/extensions/extension_management.cc
|
| @@ -105,9 +105,10 @@ ExtensionManagement::InstallationMode ExtensionManagement::GetInstallationMode(
|
| return default_settings_->installation_mode;
|
| }
|
|
|
| -scoped_ptr<base::DictionaryValue> ExtensionManagement::GetForceInstallList()
|
| - const {
|
| - scoped_ptr<base::DictionaryValue> install_list(new base::DictionaryValue());
|
| +std::unique_ptr<base::DictionaryValue>
|
| +ExtensionManagement::GetForceInstallList() const {
|
| + std::unique_ptr<base::DictionaryValue> install_list(
|
| + new base::DictionaryValue());
|
| for (SettingsIdMap::const_iterator it = settings_by_id_.begin();
|
| it != settings_by_id_.end();
|
| ++it) {
|
| @@ -119,9 +120,10 @@ scoped_ptr<base::DictionaryValue> ExtensionManagement::GetForceInstallList()
|
| return install_list;
|
| }
|
|
|
| -scoped_ptr<base::DictionaryValue>
|
| +std::unique_ptr<base::DictionaryValue>
|
| ExtensionManagement::GetRecommendedInstallList() const {
|
| - scoped_ptr<base::DictionaryValue> install_list(new base::DictionaryValue());
|
| + std::unique_ptr<base::DictionaryValue> install_list(
|
| + new base::DictionaryValue());
|
| for (SettingsIdMap::const_iterator it = settings_by_id_.begin();
|
| it != settings_by_id_.end();
|
| ++it) {
|
| @@ -205,10 +207,10 @@ APIPermissionSet ExtensionManagement::GetBlockedAPIPermissions(
|
| return default_settings_->blocked_permissions;
|
| }
|
|
|
| -scoped_ptr<const PermissionSet> ExtensionManagement::GetBlockedPermissions(
|
| +std::unique_ptr<const PermissionSet> ExtensionManagement::GetBlockedPermissions(
|
| const Extension* extension) const {
|
| // Only api permissions are supported currently.
|
| - return scoped_ptr<const PermissionSet>(new PermissionSet(
|
| + return std::unique_ptr<const PermissionSet>(new PermissionSet(
|
| GetBlockedAPIPermissions(extension), ManifestPermissionSet(),
|
| URLPatternSet(), URLPatternSet()));
|
| }
|
| @@ -441,7 +443,7 @@ internal::IndividualSettings* ExtensionManagement::AccessById(
|
| DCHECK(crx_file::id_util::IdIsValid(id)) << "Invalid ID: " << id;
|
| SettingsIdMap::iterator it = settings_by_id_.find(id);
|
| if (it == settings_by_id_.end()) {
|
| - scoped_ptr<internal::IndividualSettings> settings(
|
| + std::unique_ptr<internal::IndividualSettings> settings(
|
| new internal::IndividualSettings(default_settings_.get()));
|
| it = settings_by_id_.add(id, std::move(settings)).first;
|
| }
|
| @@ -453,7 +455,7 @@ internal::IndividualSettings* ExtensionManagement::AccessByUpdateUrl(
|
| DCHECK(GURL(update_url).is_valid()) << "Invalid update URL: " << update_url;
|
| SettingsUpdateUrlMap::iterator it = settings_by_update_url_.find(update_url);
|
| if (it == settings_by_update_url_.end()) {
|
| - scoped_ptr<internal::IndividualSettings> settings(
|
| + std::unique_ptr<internal::IndividualSettings> settings(
|
| new internal::IndividualSettings(default_settings_.get()));
|
| it = settings_by_update_url_.add(update_url, std::move(settings)).first;
|
| }
|
|
|