| Index: chrome/browser/safe_browsing/safe_browsing_service.cc
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| index 358cfa2cd88d3196302dd707046bafb61c15b277..378c3bbc302d848160774acd02f2f825187aea61 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
|
| @@ -56,6 +56,7 @@
|
| #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/script_request_detector.h"
|
| #include "chrome/browser/safe_browsing/incident_reporting/variations_seed_signature_analyzer.h"
|
| #endif
|
|
|
| @@ -231,6 +232,8 @@ void SafeBrowsingService::Initialize() {
|
| if (IsIncidentReportingServiceEnabled()) {
|
| incident_service_.reset(new safe_browsing::IncidentReportingService(
|
| this, url_request_context_getter_));
|
| + script_request_detector_.reset(
|
| + new safe_browsing::ScriptRequestDetector(incident_service_.get()));
|
| }
|
|
|
| off_domain_inclusion_detector_.reset(
|
| @@ -278,6 +281,9 @@ void SafeBrowsingService::ShutDown() {
|
|
|
| #if defined(FULL_SAFE_BROWSING)
|
| off_domain_inclusion_detector_.reset();
|
| + script_request_detector_.reset();
|
| + // Note that it is important that incident_service_ be destroyed AFTER the
|
| + // detectors.
|
| incident_service_.reset();
|
| #endif
|
|
|
| @@ -359,6 +365,8 @@ void SafeBrowsingService::OnResourceRequest(const net::URLRequest* request) {
|
| #if defined(FULL_SAFE_BROWSING)
|
| if (off_domain_inclusion_detector_)
|
| off_domain_inclusion_detector_->OnResourceRequest(request);
|
| + if (script_request_detector_)
|
| + script_request_detector_->OnResourceRequest(request);
|
| #endif
|
| }
|
|
|
|
|