Index: chrome/browser/extensions/external_provider_impl.cc |
diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc |
index fe47198905b3f567194be89fe955619d85860b40..750228c168ac05ef036fc77e2af4ae73896969e7 100644 |
--- a/chrome/browser/extensions/external_provider_impl.cc |
+++ b/chrome/browser/extensions/external_provider_impl.cc |
@@ -122,15 +122,17 @@ void ExternalProviderImpl::SetPrefs(base::DictionaryValue* prefs) { |
prefs_.reset(prefs); |
ready_ = true; // Queries for extensions are allowed from this point. |
- ScopedVector<ExternalInstallInfoUpdateUrl> external_update_url_extensions; |
- ScopedVector<ExternalInstallInfoFile> external_file_extensions; |
+ std::vector<std::unique_ptr<ExternalInstallInfoUpdateUrl>> |
+ external_update_url_extensions; |
+ std::vector<std::unique_ptr<ExternalInstallInfoFile>> |
+ external_file_extensions; |
RetrieveExtensionsFromPrefs(&external_update_url_extensions, |
&external_file_extensions); |
- for (auto* extension : external_update_url_extensions) |
+ for (const auto& extension : external_update_url_extensions) |
service_->OnExternalExtensionUpdateUrlFound(*extension, true); |
- for (auto* extension : external_file_extensions) |
+ for (const auto& extension : external_file_extensions) |
service_->OnExternalExtensionFileFound(*extension); |
service_->OnExternalProviderReady(this); |
@@ -159,8 +161,10 @@ void ExternalProviderImpl::UpdatePrefs(base::DictionaryValue* prefs) { |
prefs_.reset(prefs); |
- ScopedVector<ExternalInstallInfoUpdateUrl> external_update_url_extensions; |
- ScopedVector<ExternalInstallInfoFile> external_file_extensions; |
+ std::vector<std::unique_ptr<ExternalInstallInfoUpdateUrl>> |
+ external_update_url_extensions; |
+ std::vector<std::unique_ptr<ExternalInstallInfoFile>> |
+ external_file_extensions; |
RetrieveExtensionsFromPrefs(&external_update_url_extensions, |
&external_file_extensions); |
@@ -173,8 +177,10 @@ void ExternalProviderImpl::UpdatePrefs(base::DictionaryValue* prefs) { |
} |
void ExternalProviderImpl::RetrieveExtensionsFromPrefs( |
- ScopedVector<ExternalInstallInfoUpdateUrl>* external_update_url_extensions, |
- ScopedVector<ExternalInstallInfoFile>* external_file_extensions) { |
+ std::vector<std::unique_ptr<ExternalInstallInfoUpdateUrl>>* |
+ external_update_url_extensions, |
+ std::vector<std::unique_ptr<ExternalInstallInfoFile>>* |
+ external_file_extensions) { |
// Set of unsupported extensions that need to be deleted from prefs_. |
std::set<std::string> unsupported_extensions; |
@@ -351,9 +357,10 @@ void ExternalProviderImpl::RetrieveExtensionsFromPrefs( |
<< external_version << "\"."; |
continue; |
} |
- external_file_extensions->push_back(new ExternalInstallInfoFile( |
- extension_id, std::move(version), path, crx_location_, creation_flags, |
- auto_acknowledge_, install_immediately_)); |
+ external_file_extensions->push_back( |
+ base::MakeUnique<ExternalInstallInfoFile>( |
+ extension_id, std::move(version), path, crx_location_, |
+ creation_flags, auto_acknowledge_, install_immediately_)); |
} else { // if (has_external_update_url) |
CHECK(has_external_update_url); // Checking of keys above ensures this. |
if (download_location_ == Manifest::INVALID_LOCATION) { |
@@ -370,7 +377,7 @@ void ExternalProviderImpl::RetrieveExtensionsFromPrefs( |
continue; |
} |
external_update_url_extensions->push_back( |
- new ExternalInstallInfoUpdateUrl( |
+ base::MakeUnique<ExternalInstallInfoUpdateUrl>( |
extension_id, install_parameter, std::move(update_url), |
download_location_, creation_flags, auto_acknowledge_)); |
} |