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 /chrome/browser/component_updater | |
| 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 'chrome/browser/component_updater')
| -rw-r--r-- | chrome/browser/component_updater/component_updater_service.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/component_updater/component_updater_service_unittest.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index 6e18fd5..06e2bae 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -28,10 +28,10 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/utility_process_host.h" #include "content/public/browser/utility_process_host_client.h" -#include "content/public/common/url_fetcher.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/load_flags.h" +#include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" using content::BrowserThread; @@ -506,7 +506,7 @@ void CrxUpdateService::ProcessPendingItems() { context->pk_hash = item->component.pk_hash; context->id = item->id; context->installer = item->component.installer; - url_fetcher_.reset(content::URLFetcher::Create( + url_fetcher_.reset(net::URLFetcher::Create( 0, item->crx_url, net::URLFetcher::GET, MakeContextDelegate(this, context))); StartFetch(url_fetcher_.get(), config_->RequestContext(), true); @@ -567,7 +567,7 @@ void CrxUpdateService::ProcessPendingItems() { const std::string full_query = MakeFinalQuery(config_->UpdateUrl().spec(), query, config_->ExtraRequestParams()); - url_fetcher_.reset(content::URLFetcher::Create( + url_fetcher_.reset(net::URLFetcher::Create( 0, GURL(full_query), net::URLFetcher::GET, MakeContextDelegate(this, new UpdateContext()))); StartFetch(url_fetcher_.get(), config_->RequestContext(), false); diff --git a/chrome/browser/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc index b1fe380..6a25757 100644 --- a/chrome/browser/component_updater/component_updater_service_unittest.cc +++ b/chrome/browser/component_updater/component_updater_service_unittest.cc @@ -16,11 +16,11 @@ #include "chrome/common/chrome_paths.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" -#include "content/public/common/url_fetcher.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_notification_tracker.h" #include "googleurl/src/gurl.h" #include "libxml/globals.h" +#include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -158,11 +158,11 @@ class ComponentUpdaterTest : public testing::Test { notification_tracker_.ListenFor( notifications[ix], content::NotificationService::AllSources()); } - content::URLFetcher::SetEnableInterceptionForTests(true); + net::URLFetcher::SetEnableInterceptionForTests(true); } ~ComponentUpdaterTest() { - content::URLFetcher::SetEnableInterceptionForTests(false); + net::URLFetcher::SetEnableInterceptionForTests(false); } void TearDown() { |