diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 08:20:53 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 08:20:53 +0000 |
| commit | 3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9 (patch) | |
| tree | 062a1879d04c5f3a19b84c0502cecb532df198b1 /content/common/net | |
| parent | 6b04841b5231edf19914543504cf52f39b1baca7 (diff) | |
| download | chromium_src-3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9.zip chromium_src-3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9.tar.gz chromium_src-3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9.tar.bz2 | |
Move content::URLFetcher static functions to net::URLFetcher
Remove content::URLFetcher.
Update all references.
Add explicit dependency on content_common from browser, since template_url_fetcher.cc calls AssociateURLFetcherWithRenderView
(there are probably other direct uses of content_common).
BUG=118220
TEST=
TBR=satorux@chromium.org,mnissler@chromium.org,mal@chromium.org,jhawkins@chromium.org,sky@chromium.org,rlp@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10554008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/net')
| -rw-r--r-- | content/common/net/url_fetcher.cc | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/content/common/net/url_fetcher.cc b/content/common/net/url_fetcher.cc index 5b3f5cc..d356f35 100644 --- a/content/common/net/url_fetcher.cc +++ b/content/common/net/url_fetcher.cc @@ -6,37 +6,23 @@ #include "base/bind.h" #include "content/common/net/url_request_user_data.h" -#include "net/url_request/url_fetcher_factory.h" -#include "net/url_request/url_fetcher_impl.h" +#include "net/url_request/url_fetcher.h" -// static -net::URLFetcher* content::URLFetcher::Create( - const GURL& url, - net::URLFetcher::RequestType request_type, - net::URLFetcherDelegate* d) { - return new net::URLFetcherImpl(url, request_type, d); -} +namespace content { + +namespace URLFetcher { -// static -net::URLFetcher* content::URLFetcher::Create( - int id, +// We have to mark the definition as CONTENT_EXPORT, too, as the +// declaration isn't visible from here (since it's protected by an +// #ifdef). +CONTENT_EXPORT net::URLFetcher* Create( const GURL& url, net::URLFetcher::RequestType request_type, net::URLFetcherDelegate* d) { - net::URLFetcherFactory* factory = net::URLFetcherImpl::factory(); - return factory ? factory->CreateURLFetcher(id, url, request_type, d) : - new net::URLFetcherImpl(url, request_type, d); + return net::URLFetcher::Create(url, request_type, d); } -// static -void content::URLFetcher::CancelAll() { - net::URLFetcherImpl::CancelAll(); -} - -// static -void content::URLFetcher::SetEnableInterceptionForTests(bool enabled) { - net::URLFetcherImpl::SetEnableInterceptionForTests(enabled); -} +} // namespace URLFetcher namespace { @@ -48,8 +34,6 @@ base::SupportsUserData::Data* CreateURLRequestUserData( } // namespace -namespace content { - void AssociateURLFetcherWithRenderView(net::URLFetcher* url_fetcher, const GURL& first_party_for_cookies, int render_process_id, |