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/importer | |
| 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/importer')
| -rw-r--r-- | chrome/browser/importer/toolbar_importer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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); |