From 3dc1bc4dd66c4fbf8afd6e5b02115ee3772c21a9 Mon Sep 17 00:00:00 2001 From: "akalin@chromium.org" Date: Tue, 19 Jun 2012 08:20:53 +0000 Subject: 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 --- chrome/browser/importer/toolbar_importer.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/importer') diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index cc38da4..60ec73a 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -16,9 +16,9 @@ #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" -#include "content/public/common/url_fetcher.h" #include "grit/generated_resources.h" #include "net/base/load_flags.h" +#include "net/url_request/url_fetcher.h" #include "third_party/libxml/chromium/libxml_utils.h" using content::BrowserThread; @@ -213,7 +213,7 @@ void Toolbar5Importer::GetAuthenticationFromServer() { // Because the importer is started as the result of a user action which // explicitly requires authentication, sending cookies here is reasonable. - token_fetcher_ = content::URLFetcher::Create( + token_fetcher_ = net::URLFetcher::Create( url, net::URLFetcher::GET, this); token_fetcher_->SetRequestContext(request_context_getter_.get()); token_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES); @@ -250,7 +250,7 @@ void Toolbar5Importer::GetBookmarkDataFromServer(const std::string& response) { // Because the importer is started as the result of a user action which // explicitly requires authentication, sending cookies here is reasonable. - data_fetcher_ = content::URLFetcher::Create( + data_fetcher_ = net::URLFetcher::Create( url, net::URLFetcher::GET, this); data_fetcher_->SetRequestContext(request_context_getter_.get()); data_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES); -- cgit v1.1