diff options
Diffstat (limited to 'chromium/components/search_engines/template_url_service.cc')
| -rw-r--r-- | chromium/components/search_engines/template_url_service.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chromium/components/search_engines/template_url_service.cc b/chromium/components/search_engines/template_url_service.cc index fd94cadbe8e..c85d04dad47 100644 --- a/chromium/components/search_engines/template_url_service.cc +++ b/chromium/components/search_engines/template_url_service.cc @@ -14,7 +14,6 @@ #include "base/debug/crash_logging.h" #include "base/format_macros.h" #include "base/guid.h" -#include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -509,7 +508,7 @@ void TemplateURLService::RegisterOmniboxKeyword( data.SetShortName(base::UTF8ToUTF16(extension_name)); data.SetKeyword(base::UTF8ToUTF16(keyword)); data.SetURL(template_url_string); - Add(base::MakeUnique<TemplateURL>(data, TemplateURL::OMNIBOX_API_EXTENSION, + Add(std::make_unique<TemplateURL>(data, TemplateURL::OMNIBOX_API_EXTENSION, extension_id, extension_install_time, false)); } @@ -630,7 +629,7 @@ void TemplateURLService::RepairPrepopulatedSearchEngines() { actions.added_engines.begin(); i < actions.added_engines.end(); ++i) { - AddNoNotify(base::MakeUnique<TemplateURL>(*i), true); + AddNoNotify(std::make_unique<TemplateURL>(*i), true); } base::AutoReset<DefaultSearchChangeOrigin> change_origin( @@ -713,7 +712,7 @@ void TemplateURLService::OnWebDataServiceRequestDone( } std::unique_ptr<OwnedTemplateURLVector> template_urls = - base::MakeUnique<OwnedTemplateURLVector>(); + std::make_unique<OwnedTemplateURLVector>(); int new_resource_keyword_version = 0; { GetSearchProvidersUsingKeywordResult( @@ -921,7 +920,7 @@ syncer::SyncError TemplateURLService::ProcessSyncChanges( TemplateURLData data(turl->data()); data.id = kInvalidTemplateURLID; std::unique_ptr<TemplateURL> added_ptr = - base::MakeUnique<TemplateURL>(data); + std::make_unique<TemplateURL>(data); TemplateURL* added = added_ptr.get(); if (AddNoNotify(std::move(added_ptr), true)) { should_notify = true; @@ -1328,7 +1327,7 @@ void TemplateURLService::Init(const Initializer* initializers, data.SetShortName(base::UTF8ToUTF16(initializers[i].content)); data.SetKeyword(base::UTF8ToUTF16(initializers[i].keyword)); data.SetURL(initializers[i].url); - AddNoNotify(base::MakeUnique<TemplateURL>(data), true); + AddNoNotify(std::make_unique<TemplateURL>(data), true); // Set the first provided identifier to be the default. if (i == 0) @@ -1810,7 +1809,7 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics( ? TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION : TemplateURL::NORMAL; initial_default_search_provider_ = - data ? base::MakeUnique<TemplateURL>(*data, initial_engine_type) + data ? std::make_unique<TemplateURL>(*data, initial_engine_type) : nullptr; default_search_provider_source_ = source; return changed; @@ -1868,7 +1867,7 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics( // (2) If the user deleted the pre-populated default and we subsequently // lost their user-selected value. default_search_provider_ = - AddNoNotify(base::MakeUnique<TemplateURL>(*data), true); + AddNoNotify(std::make_unique<TemplateURL>(*data), true); } } else if (source == DefaultSearchManager::FROM_USER) { default_search_provider_ = GetTemplateURLForGUID(data->sync_guid); @@ -1882,7 +1881,7 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics( } else { new_data.id = kInvalidTemplateURLID; default_search_provider_ = - AddNoNotify(base::MakeUnique<TemplateURL>(new_data), true); + AddNoNotify(std::make_unique<TemplateURL>(new_data), true); } if (default_search_provider_ && prefs_) { prefs_->SetString(prefs::kSyncedDefaultSearchProviderGUID, @@ -2064,7 +2063,7 @@ void TemplateURLService::UpdateProvidersCreatedByPolicy( new_data.sync_guid = base::GenerateGUID(); new_data.created_by_policy = true; std::unique_ptr<TemplateURL> new_dse_ptr = - base::MakeUnique<TemplateURL>(new_data); + std::make_unique<TemplateURL>(new_data); TemplateURL* new_dse = new_dse_ptr.get(); if (AddNoNotify(std::move(new_dse_ptr), true)) default_search_provider_ = new_dse; @@ -2269,7 +2268,7 @@ bool TemplateURLService::MergeInSyncTemplateURL( TemplateURLData data(sync_turl->data()); data.id = kInvalidTemplateURLID; std::unique_ptr<TemplateURL> added_ptr = - base::MakeUnique<TemplateURL>(data); + std::make_unique<TemplateURL>(data); TemplateURL* added = added_ptr.get(); base::AutoReset<DefaultSearchChangeOrigin> change_origin( &dsp_change_origin_, DSP_CHANGE_SYNC_ADD); |