diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 21:47:46 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 21:47:46 +0000 |
| commit | ebf7966effc5b6ddc656bf826fabab0d4315cee7 (patch) | |
| tree | 21955fdf8c51716a9f75306194eebb55068e4d70 | |
| parent | ffa8c971ddb892033b50652d8d2c25111e6a6c25 (diff) | |
| download | chromium_src-ebf7966effc5b6ddc656bf826fabab0d4315cee7.zip chromium_src-ebf7966effc5b6ddc656bf826fabab0d4315cee7.tar.gz chromium_src-ebf7966effc5b6ddc656bf826fabab0d4315cee7.tar.bz2 | |
Towards an android build of sync_unit_tests
BUG=
TEST=
Review URL: http://codereview.chromium.org/9348039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121049 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/search_engines/template_url_service.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc index 5a4a785..e89b9e3 100644 --- a/chrome/browser/search_engines/template_url_service.cc +++ b/chrome/browser/search_engines/template_url_service.cc @@ -402,7 +402,7 @@ std::vector<const TemplateURL*> TemplateURLService::GetTemplateURLs() const { } void TemplateURLService::IncrementUsageCount(const TemplateURL* url) { - DCHECK(url && find(template_urls_.begin(), template_urls_.end(), url) != + DCHECK(url && std::find(template_urls_.begin(), template_urls_.end(), url) != template_urls_.end()); const_cast<TemplateURL*>(url)->set_usage_count(url->usage_count() + 1); if (service_.get()) @@ -1296,8 +1296,8 @@ void TemplateURLService::UpdateNoNotify(const TemplateURL* existing_turl, const TemplateURL& new_values) { DCHECK(loaded_); DCHECK(existing_turl); - DCHECK(find(template_urls_.begin(), template_urls_.end(), existing_turl) != - template_urls_.end()); + DCHECK(std::find(template_urls_.begin(), template_urls_.end(), existing_turl) + != template_urls_.end()); if (!existing_turl->keyword().empty()) keyword_to_template_map_.erase(existing_turl->keyword()); @@ -1563,8 +1563,8 @@ void TemplateURLService::UpdateDefaultSearch() { void TemplateURLService::SetDefaultSearchProviderNoNotify( const TemplateURL* url) { - DCHECK(!url || find(template_urls_.begin(), template_urls_.end(), url) != - template_urls_.end()); + DCHECK(!url || std::find(template_urls_.begin(), template_urls_.end(), url) + != template_urls_.end()); default_search_provider_ = url; if (url) { @@ -1610,8 +1610,8 @@ void TemplateURLService::SetDefaultSearchProviderNoNotify( void TemplateURLService::AddNoNotify(TemplateURL* template_url) { DCHECK(template_url); DCHECK(template_url->id() == 0); - DCHECK(find(template_urls_.begin(), template_urls_.end(), template_url) == - template_urls_.end()); + DCHECK(std::find(template_urls_.begin(), template_urls_.end(), template_url) + == template_urls_.end()); template_url->set_id(++next_id_); template_urls_.push_back(template_url); AddToMaps(template_url); @@ -1625,9 +1625,9 @@ void TemplateURLService::AddNoNotify(TemplateURL* template_url) { } void TemplateURLService::RemoveNoNotify(const TemplateURL* template_url) { - TemplateURLVector::iterator i = find(template_urls_.begin(), - template_urls_.end(), - template_url); + TemplateURLVector::iterator i = std::find(template_urls_.begin(), + template_urls_.end(), + template_url); if (i == template_urls_.end()) return; |