Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: components/search_engines/template_url_service.cc

Issue 2307663002: Remove ScopedVector from search_engines. (Closed)
Patch Set: devlin Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/search_engines/template_url_service.cc
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index 02f4b9a18f5cdce17428815b954dc269780cb185..18f5d5585c522b8d9e45da6c5214531c89da3dc4 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -14,7 +14,6 @@
#include "base/guid.h"
#include "base/i18n/case_conversion.h"
#include "base/memory/ptr_util.h"
-#include "base/memory/scoped_vector.h"
#include "base/metrics/histogram_macros.h"
#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_split.h"
@@ -665,7 +664,7 @@ void TemplateURLService::RepairPrepopulatedSearchEngines() {
}
size_t default_search_provider_index = 0;
- ScopedVector<TemplateURLData> prepopulated_urls =
+ std::vector<std::unique_ptr<TemplateURLData>> prepopulated_urls =
TemplateURLPrepopulateData::GetPrepopulatedEngines(
prefs_, &default_search_provider_index);
DCHECK(!prepopulated_urls.empty());
@@ -1737,14 +1736,14 @@ void TemplateURLService::UpdateTemplateURLIfPrepopulated(
return;
size_t default_search_index;
- ScopedVector<TemplateURLData> prepopulated_urls =
- TemplateURLPrepopulateData::GetPrepopulatedEngines(
- prefs, &default_search_index);
-
- for (size_t i = 0; i < prepopulated_urls.size(); ++i) {
- if (prepopulated_urls[i]->prepopulate_id == prepopulate_id) {
- MergeIntoPrepopulatedEngineData(template_url, prepopulated_urls[i]);
- template_url->CopyFrom(TemplateURL(*prepopulated_urls[i]));
+ std::vector<std::unique_ptr<TemplateURLData>> prepopulated_urls =
+ TemplateURLPrepopulateData::GetPrepopulatedEngines(prefs,
+ &default_search_index);
+
+ for (const auto& url : prepopulated_urls) {
+ if (url->prepopulate_id == prepopulate_id) {
+ MergeIntoPrepopulatedEngineData(template_url, url.get());
+ template_url->CopyFrom(TemplateURL(*url));
}
}
}

Powered by Google App Engine
This is Rietveld 408576698