diff options
| author | dcheng <dcheng@chromium.org> | 2014-08-28 12:22:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 19:25:01 +0000 |
| commit | 4082bfc58da57d17f82ce409865b2b77df0f0556 (patch) | |
| tree | f84daccb0731d49fc62d86e5eec817f4f6c9aee2 | |
| parent | 6618cd1694953a98e999f7b4d0b4db95717a17aa (diff) | |
| download | chromium_src-4082bfc58da57d17f82ce409865b2b77df0f0556.zip chromium_src-4082bfc58da57d17f82ce409865b2b77df0f0556.tar.gz chromium_src-4082bfc58da57d17f82ce409865b2b77df0f0556.tar.bz2 | |
Fixups in TemplateURLService for scoped_refptr operator T* removal
BUG=110610
Review URL: https://codereview.chromium.org/515303002
Cr-Commit-Position: refs/heads/master@{#292442}
| -rw-r--r-- | components/search_engines/template_url_service.cc | 2 | ||||
| -rw-r--r-- | components/search_engines/template_url_service.h | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc index 1fcc704..0931a0c 100644 --- a/components/search_engines/template_url_service.cc +++ b/components/search_engines/template_url_service.cc @@ -180,7 +180,7 @@ class TemplateURLService::LessWithPrefix { TemplateURLService::TemplateURLService( PrefService* prefs, scoped_ptr<SearchTermsData> search_terms_data, - KeywordWebDataService* web_data_service, + const scoped_refptr<KeywordWebDataService>& web_data_service, scoped_ptr<TemplateURLServiceClient> client, GoogleURLTracker* google_url_tracker, rappor::RapporService* rappor_service, diff --git a/components/search_engines/template_url_service.h b/components/search_engines/template_url_service.h index 3e4f19a..7ffb019 100644 --- a/components/search_engines/template_url_service.h +++ b/components/search_engines/template_url_service.h @@ -87,13 +87,14 @@ class TemplateURLService : public WebDataServiceConsumer, bool is_keyword_transition; }; - TemplateURLService(PrefService* prefs, - scoped_ptr<SearchTermsData> search_terms_data, - KeywordWebDataService* web_data_service, - scoped_ptr<TemplateURLServiceClient> client, - GoogleURLTracker* google_url_tracker, - rappor::RapporService* rappor_service, - const base::Closure& dsp_change_callback); + TemplateURLService( + PrefService* prefs, + scoped_ptr<SearchTermsData> search_terms_data, + const scoped_refptr<KeywordWebDataService>& web_data_service, + scoped_ptr<TemplateURLServiceClient> client, + GoogleURLTracker* google_url_tracker, + rappor::RapporService* rappor_service, + const base::Closure& dsp_change_callback); // The following is for testing. TemplateURLService(const Initializer* initializers, const int count); virtual ~TemplateURLService(); |