diff options
| author | joenotcharles <joenotcharles@chromium.org> | 2016-01-13 19:14:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-14 03:16:16 +0000 |
| commit | 6bfbef70b64013c329dc743a2291bbe0e7b454c3 (patch) | |
| tree | 8cb1361ff124877c392038b5923c600f0011e755 | |
| parent | 5dde0f86bcffdeea744cc29462b814c7ffdcf6e0 (diff) | |
| download | chromium_src-6bfbef70b64013c329dc743a2291bbe0e7b454c3.zip chromium_src-6bfbef70b64013c329dc743a2291bbe0e7b454c3.tar.gz chromium_src-6bfbef70b64013c329dc743a2291bbe0e7b454c3.tar.bz2 | |
Disable OffDomainInclusionDetector until it can be better optimized.
BUG=576750
Review URL: https://codereview.chromium.org/1582583002
Cr-Commit-Position: refs/heads/master@{#369296}
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.h | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index fbd1026..92479c8 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -63,7 +63,6 @@ #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h" #include "chrome/browser/safe_browsing/incident_reporting/blacklist_load_analyzer.h" #include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h" -#include "chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.h" #include "chrome/browser/safe_browsing/incident_reporting/resource_request_detector.h" #include "chrome/browser/safe_browsing/incident_reporting/variations_seed_signature_analyzer.h" #endif @@ -241,9 +240,6 @@ void SafeBrowsingService::Initialize() { incident_service_.reset(CreateIncidentReportingService()); resource_request_detector_.reset(new ResourceRequestDetector( incident_service_->GetIncidentReceiver())); - - off_domain_inclusion_detector_.reset( - new OffDomainInclusionDetector(database_manager_)); #endif // !defined(FULL_SAFE_BROWSING) // Track the safe browsing preference of existing profiles. @@ -289,7 +285,6 @@ void SafeBrowsingService::ShutDown() { csd_service_.reset(); #if defined(FULL_SAFE_BROWSING) - off_domain_inclusion_detector_.reset(); resource_request_detector_.reset(); incident_service_.reset(); #endif @@ -375,8 +370,6 @@ void SafeBrowsingService::OnResourceRequest(const net::URLRequest* request) { #if defined(FULL_SAFE_BROWSING) TRACE_EVENT1("SafeBrowsing", "SafeBrowsingServer::OnResourceRequest", "url", request->url().spec()); - if (off_domain_inclusion_detector_) - off_domain_inclusion_detector_->OnResourceRequest(request); if (resource_request_detector_) resource_request_detector_->OnResourceRequest(request); #endif diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 324d435..c1e4979 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h @@ -308,8 +308,6 @@ class SafeBrowsingService scoped_refptr<SafeBrowsingDatabaseManager> database_manager_; #if defined(FULL_SAFE_BROWSING) - scoped_ptr<OffDomainInclusionDetector> off_domain_inclusion_detector_; - scoped_ptr<ResourceRequestDetector> resource_request_detector_; #endif |