diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 01:12:22 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-26 01:12:22 +0000 |
| commit | 36aea270be00f58680c3eff2cfeb7061c35276d5 (patch) | |
| tree | 08066a2eef66b64f9a98fb16160b9ac90c1a82b1 /chrome/browser/search_engines | |
| parent | 28973f008ca89d623ec9ce48518a04436b1c71e4 (diff) | |
| download | chromium_src-36aea270be00f58680c3eff2cfeb7061c35276d5.zip chromium_src-36aea270be00f58680c3eff2cfeb7061c35276d5.tar.gz chromium_src-36aea270be00f58680c3eff2cfeb7061c35276d5.tar.bz2 | |
Convert chrome callers of UrlFetcher to use the interface. I'll switch tests to use composition instead of inheritence in a future change.
BUG=98716
Review URL: http://codereview.chromium.org/8395023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_fetcher.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index abaed39..ac3189e 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -15,10 +15,10 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/net/url_fetcher.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "content/public/common/url_fetcher.h" #include "content/public/common/url_fetcher_delegate.h" #include "net/url_request/url_request_status.h" @@ -57,7 +57,7 @@ class TemplateURLFetcher::RequestDelegate private: void AddSearchProvider(); - URLFetcher url_fetcher_; + scoped_ptr<content::URLFetcher> url_fetcher_; TemplateURLFetcher* fetcher_; scoped_ptr<TemplateURL> template_url_; string16 keyword_; @@ -79,8 +79,8 @@ TemplateURLFetcher::RequestDelegate::RequestDelegate( const GURL& favicon_url, TemplateURLFetcherCallbacks* callbacks, ProviderType provider_type) - : ALLOW_THIS_IN_INITIALIZER_LIST(url_fetcher_(osdd_url, - URLFetcher::GET, this)), + : ALLOW_THIS_IN_INITIALIZER_LIST(url_fetcher_(content::URLFetcher::Create( + osdd_url, content::URLFetcher::GET, this))), fetcher_(fetcher), keyword_(keyword), osdd_url_(osdd_url), @@ -99,8 +99,8 @@ TemplateURLFetcher::RequestDelegate::RequestDelegate( model->Load(); } - url_fetcher_.SetRequestContext(fetcher->profile()->GetRequestContext()); - url_fetcher_.Start(); + url_fetcher_->SetRequestContext(fetcher->profile()->GetRequestContext()); + url_fetcher_->Start(); } void TemplateURLFetcher::RequestDelegate::Observe( |