diff options
Diffstat (limited to 'chrome/browser/chromeos')
5 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index cd7ac2e..932ec75 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -22,7 +22,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" #include "content/public/browser/browser_thread.h" -#include "content/public/common/url_fetcher.h" +#include "net/url_request/url_fetcher.h" using content::BrowserThread; @@ -295,7 +295,7 @@ void ServicesCustomizationDocument::ReadFileInBackground(const FilePath& file) { void ServicesCustomizationDocument::StartFileFetch() { DCHECK(url_.is_valid()); - url_fetcher_.reset(content::URLFetcher::Create( + url_fetcher_.reset(net::URLFetcher::Create( url_, net::URLFetcher::GET, this)); url_fetcher_->SetRequestContext( ProfileManager::GetDefaultProfile()->GetRequestContext()); diff --git a/chrome/browser/chromeos/gdata/gdata_operations.cc b/chrome/browser/chromeos/gdata/gdata_operations.cc index 4d6e8f9..9781153 100644 --- a/chrome/browser/chromeos/gdata/gdata_operations.cc +++ b/chrome/browser/chromeos/gdata/gdata_operations.cc @@ -15,9 +15,9 @@ #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/net/url_util.h" -#include "content/public/common/url_fetcher.h" #include "net/base/escape.h" #include "net/http/http_util.h" +#include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" #include "third_party/libxml/chromium/libxml_utils.h" @@ -267,7 +267,7 @@ void UrlFetchOperationBase::Start(const std::string& auth_token) { DVLOG(1) << "URL: " << url.spec(); url_fetcher_.reset( - content::URLFetcher::Create(url, GetRequestType(), this)); + net::URLFetcher::Create(url, GetRequestType(), this)); url_fetcher_->SetRequestContext(g_browser_process->system_request_context()); // Always set flags to neither send nor save cookies. url_fetcher_->SetLoadFlags( diff --git a/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc b/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc index e61fbea..271f8bc 100644 --- a/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc +++ b/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc @@ -243,7 +243,7 @@ void GDataURLRequestJob::Start() { // GetDownloadDataCallback - this would either get it from cache or // download it from gdata. // 7) If file is downloaded from gdata: - // 7.1) Whenever content::URLFetcherCore::OnReadCompleted() receives a part + // 7.1) Whenever net::URLFetcherCore::OnReadCompleted() receives a part // of the response, it invokes // constent::URLFetcherDelegate::OnURLFetchDownloadData() if // net::URLFetcherDelegate::ShouldSendDownloadData() is true. @@ -259,7 +259,7 @@ void GDataURLRequestJob::Start() { // 7.4) Copies the formal download data into a growable-drainable dowload // IOBuffer // - IOBuffer has initial size 4096, same as buffer used in - // content::URLFetcherCore::OnReadCompleted. + // net::URLFetcherCore::OnReadCompleted. // - We may end up with multiple chunks, so we use GrowableIOBuffer. // - We then wrap the growable buffer within a DrainableIOBuffer for // ease of progressively writing into the buffer. diff --git a/chrome/browser/chromeos/imageburner/burn_manager.cc b/chrome/browser/chromeos/imageburner/burn_manager.cc index 775a2e0..c2d035d 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.cc +++ b/chrome/browser/chromeos/imageburner/burn_manager.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_thread.h" -#include "content/public/common/url_fetcher.h" +#include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_status.h" using content::BrowserThread; @@ -281,7 +281,7 @@ void BurnManager::FetchConfigFile(Delegate* delegate) { if (config_fetcher_.get()) return; - config_fetcher_.reset(content::URLFetcher::Create( + config_fetcher_.reset(net::URLFetcher::Create( config_file_url_, net::URLFetcher::GET, this)); config_fetcher_->SetRequestContext( g_browser_process->system_request_context()); @@ -291,9 +291,9 @@ void BurnManager::FetchConfigFile(Delegate* delegate) { void BurnManager::FetchImage(const GURL& image_url, const FilePath& file_path) { tick_image_download_start_ = base::TimeTicks::Now(); bytes_image_download_progress_last_reported_ = 0; - image_fetcher_.reset(content::URLFetcher::Create(image_url, - net::URLFetcher::GET, - this)); + image_fetcher_.reset(net::URLFetcher::Create(image_url, + net::URLFetcher::GET, + this)); image_fetcher_->SetRequestContext( g_browser_process->system_request_context()); image_fetcher_->SaveResponseToFileAtPath( diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc index afd1973..2511f28 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.cc +++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc @@ -10,9 +10,9 @@ #include "base/message_loop.h" #include "base/stringprintf.h" #include "content/public/browser/browser_thread.h" -#include "content/public/common/url_fetcher.h" #include "googleurl/src/gurl.h" #include "net/http/http_status_code.h" +#include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" |