diff options
Diffstat (limited to 'chrome/browser/safe_browsing')
5 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index a272443..b00682b 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -251,7 +251,7 @@ void ClientSideDetectionService::StartFetchModel() { // network if the model isn't in the cache. model_fetcher_.reset(content::URLFetcher::Create( 0 /* ID used for testing */, GURL(kClientModelUrl), - content::URLFetcher::GET, this)); + net::URLFetcher::GET, this)); model_fetcher_->SetRequestContext(request_context_getter_.get()); model_fetcher_->Start(); } @@ -302,9 +302,9 @@ void ClientSideDetectionService::StartClientReportPhishingRequest( return; } - content::URLFetcher* fetcher = content::URLFetcher::Create( + net::URLFetcher* fetcher = content::URLFetcher::Create( 0 /* ID used for testing */, GURL(kClientReportPhishingUrl), - content::URLFetcher::POST, this); + net::URLFetcher::POST, this); // Remember which callback and URL correspond to the current fetcher object. ClientReportInfo* info = new ClientReportInfo; diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index 34e2e8c..914c674 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -680,7 +680,7 @@ class DownloadProtectionService::CheckClientDownloadRequest << info_.download_url_chain.back(); fetcher_.reset(content::URLFetcher::Create(0 /* ID used for testing */, GURL(kDownloadRequestUrl), - content::URLFetcher::POST, + net::URLFetcher::POST, this)); fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE); fetcher_->SetAutomaticallyRetryOn5xx(false); // Don't retry on error. @@ -766,7 +766,7 @@ class DownloadProtectionService::CheckClientDownloadRequest scoped_refptr<SignatureUtil> signature_util_; scoped_refptr<SafeBrowsingService> sb_service_; const bool pingback_enabled_; - scoped_ptr<content::URLFetcher> fetcher_; + scoped_ptr<net::URLFetcher> fetcher_; bool finished_; ClientDownloadRequest::DownloadType type_; base::WeakPtrFactory<CheckClientDownloadRequest> timeout_weakptr_factory_; diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc index 1914786a..fa98e81 100644 --- a/chrome/browser/safe_browsing/malware_details_cache.cc +++ b/chrome/browser/safe_browsing/malware_details_cache.cc @@ -83,7 +83,7 @@ void MalwareDetailsCacheCollector::OpenEntry() { } current_fetch_.reset(content::URLFetcher::Create( - GURL(resources_it_->first), content::URLFetcher::GET, this)); + GURL(resources_it_->first), net::URLFetcher::GET, this)); current_fetch_->SetRequestContext(request_context_getter_); // Only from cache, and don't save cookies. current_fetch_->SetLoadFlags(net::LOAD_ONLY_FROM_CACHE | diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index dd53567..fcee8bf 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -153,8 +153,8 @@ void SafeBrowsingProtocolManager::GetFullHash( return; } GURL gethash_url = GetHashUrl(); - content::URLFetcher* fetcher = content::URLFetcher::Create( - gethash_url, content::URLFetcher::POST, this); + net::URLFetcher* fetcher = content::URLFetcher::Create( + gethash_url, net::URLFetcher::POST, this); hash_requests_[fetcher] = check; std::string get_hash; @@ -498,7 +498,7 @@ void SafeBrowsingProtocolManager::IssueChunkRequest() { GURL chunk_url = NextChunkUrl(next_chunk.url); request_type_ = CHUNK_REQUEST; request_.reset(content::URLFetcher::Create( - chunk_url, content::URLFetcher::GET, this)); + chunk_url, net::URLFetcher::GET, this)); request_->SetLoadFlags(net::LOAD_DISABLE_CACHE); request_->SetRequestContext(request_context_getter_); chunk_request_start_ = base::Time::Now(); @@ -539,7 +539,7 @@ void SafeBrowsingProtocolManager::OnGetChunksComplete( GURL update_url = UpdateUrl(); request_.reset(content::URLFetcher::Create( - update_url, content::URLFetcher::POST, this)); + update_url, net::URLFetcher::POST, this)); request_->SetLoadFlags(net::LOAD_DISABLE_CACHE); request_->SetRequestContext(request_context_getter_); request_->SetUploadData("text/plain", list_data); @@ -582,9 +582,9 @@ void SafeBrowsingProtocolManager::ReportSafeBrowsingHit( GURL report_url = SafeBrowsingHitUrl(malicious_url, page_url, referrer_url, is_subresource, threat_type); - content::URLFetcher* report = content::URLFetcher::Create( + net::URLFetcher* report = content::URLFetcher::Create( report_url, - post_data.empty() ? content::URLFetcher::GET : content::URLFetcher::POST, + post_data.empty() ? net::URLFetcher::GET : net::URLFetcher::POST, this); report->SetLoadFlags(net::LOAD_DISABLE_CACHE); report->SetRequestContext(request_context_getter_); @@ -598,8 +598,8 @@ void SafeBrowsingProtocolManager::ReportSafeBrowsingHit( void SafeBrowsingProtocolManager::ReportMalwareDetails( const std::string& report) { GURL report_url = MalwareDetailsUrl(); - content::URLFetcher* fetcher = content::URLFetcher::Create( - report_url, content::URLFetcher::POST, this); + net::URLFetcher* fetcher = content::URLFetcher::Create( + report_url, net::URLFetcher::POST, this); fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE); fetcher->SetRequestContext(request_context_getter_); fetcher->SetUploadData("application/octet-stream", report); diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 50eb4f7..708ea36 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -529,7 +529,7 @@ class SafeBrowsingServiceTestHelper // so the caller could wait till OnURLFetchComplete is called. net::URLRequestStatus::Status FetchUrl(const GURL& url) { url_fetcher_.reset(content::URLFetcher::Create( - url, content::URLFetcher::GET, this)); + url, net::URLFetcher::GET, this)); url_fetcher_->SetLoadFlags(net::LOAD_DISABLE_CACHE); url_fetcher_->SetRequestContext(request_context_); url_fetcher_->Start(); @@ -539,7 +539,7 @@ class SafeBrowsingServiceTestHelper base::OneShotTimer<SafeBrowsingServiceTestHelper> check_update_timer_; SafeBrowsingServiceTest* safe_browsing_test_; - scoped_ptr<content::URLFetcher> url_fetcher_; + scoped_ptr<net::URLFetcher> url_fetcher_; std::string response_data_; net::URLRequestStatus::Status response_status_; net::URLRequestContextGetter* request_context_; |