diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 04:23:46 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 04:23:46 +0000 |
commit | 7b419b87571595cb0046247cb71856511cefe13d (patch) | |
tree | 1244bb31f4d935a4dad4fa94df49f3537d36ae3f /chrome/service | |
parent | 6b3b4806a6ee8c88819add0ca1a19279a969c664 (diff) | |
download | chromium_src-7b419b87571595cb0046247cb71856511cefe13d.zip chromium_src-7b419b87571595cb0046247cb71856511cefe13d.tar.gz chromium_src-7b419b87571595cb0046247cb71856511cefe13d.tar.bz2 |
Rename URLFetcher to be URLFetcherImpl, now that we have the content::URLFetcher interface.
BUG=98716
Review URL: http://codereview.chromium.org/8403017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
-rw-r--r-- | chrome/service/cloud_print/cloud_print_helpers.cc | 1 | ||||
-rw-r--r-- | chrome/service/cloud_print/cloud_print_url_fetcher.cc | 8 | ||||
-rw-r--r-- | chrome/service/cloud_print/cloud_print_url_fetcher.h | 2 | ||||
-rw-r--r-- | chrome/service/gaia/service_gaia_authenticator.cc | 5 | ||||
-rw-r--r-- | chrome/service/service_process.cc | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/chrome/service/cloud_print/cloud_print_helpers.cc b/chrome/service/cloud_print/cloud_print_helpers.cc index 2477e66..492c46a 100644 --- a/chrome/service/cloud_print/cloud_print_helpers.cc +++ b/chrome/service/cloud_print/cloud_print_helpers.cc @@ -15,7 +15,6 @@ #include "base/values.h" #include "chrome/service/cloud_print/cloud_print_consts.h" #include "chrome/service/service_process.h" -#include "content/common/net/url_fetcher.h" std::string StringFromJobStatus(cloud_print::PrintJobStatus status) { std::string ret; diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.cc b/chrome/service/cloud_print/cloud_print_url_fetcher.cc index 7dbaac9..d0cd004 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher.cc @@ -26,7 +26,7 @@ void CloudPrintURLFetcher::StartGetRequest( int max_retries, const std::string& additional_headers) { StartRequestHelper(url, - URLFetcher::GET, + content::URLFetcher::GET, delegate, max_retries, std::string(), @@ -42,7 +42,7 @@ void CloudPrintURLFetcher::StartPostRequest( const std::string& post_data, const std::string& additional_headers) { StartRequestHelper(url, - URLFetcher::POST, + content::URLFetcher::POST, delegate, max_retries, post_data_mime_type, @@ -131,14 +131,14 @@ void CloudPrintURLFetcher::StartRequestHelper( DCHECK(delegate); // Persist the additional headers in case we need to retry the request. additional_headers_ = additional_headers; - request_.reset(new URLFetcher(url, request_type, this)); + request_.reset(content::URLFetcher::Create(url, request_type, this)); request_->SetRequestContext(GetRequestContextGetter()); // Since we implement our own retry logic, disable the retry in URLFetcher. request_->SetAutomaticallyRetryOn5xx(false); request_->SetMaxRetries(max_retries); SetupRequestHeaders(); delegate_ = delegate; - if (request_type == URLFetcher::POST) { + if (request_type == content::URLFetcher::POST) { request_->SetUploadData(post_data_mime_type, post_data); } diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h index f76ba4c..17e538d 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher.h +++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "content/common/net/url_fetcher.h" +#include "content/public/common/url_fetcher.h" #include "content/public/common/url_fetcher_delegate.h" class GURL; diff --git a/chrome/service/gaia/service_gaia_authenticator.cc b/chrome/service/gaia/service_gaia_authenticator.cc index e743db4..5967729 100644 --- a/chrome/service/gaia/service_gaia_authenticator.cc +++ b/chrome/service/gaia/service_gaia_authenticator.cc @@ -7,7 +7,7 @@ #include "base/message_loop_proxy.h" #include "chrome/service/net/service_url_request_context.h" #include "chrome/service/service_process.h" -#include "content/common/net/url_fetcher.h" +#include "content/public/common/url_fetcher.h" #include "googleurl/src/gurl.h" ServiceGaiaAuthenticator::ServiceGaiaAuthenticator( @@ -64,7 +64,8 @@ int ServiceGaiaAuthenticator::GetBackoffDelaySeconds( void ServiceGaiaAuthenticator::DoPost(const GURL& post_url, const std::string& post_body) { DCHECK(io_message_loop_proxy_->BelongsToCurrentThread()); - URLFetcher* request = new URLFetcher(post_url, URLFetcher::POST, this); + content::URLFetcher* request = content::URLFetcher::Create( + post_url, content::URLFetcher::POST, this); request->SetRequestContext( g_service_process->GetServiceURLRequestContextGetter()); request->SetUploadData("application/x-www-form-urlencoded", post_body); diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index e763948..03c6296 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -25,7 +25,7 @@ #include "chrome/service/net/service_url_request_context.h" #include "chrome/service/service_ipc_server.h" #include "chrome/service/service_process_prefs.h" -#include "content/common/net/url_fetcher.h" +#include "content/public/common/url_fetcher.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/network_change_notifier.h" @@ -68,7 +68,7 @@ ServiceIOThread::~ServiceIOThread() { } void ServiceIOThread::CleanUp() { - URLFetcher::CancelAll(); + content::URLFetcher::CancelAll(); } // Prepares the localized strings that are going to be displayed to |