Report malware redirectors as well.

chrome/browser/safe_browsing/safe_browsing_service.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 732 matching lines @@
           this, &SafeBrowsingService::OnBlockingPageDone, resources, false));
     return;
   }
 
   // Report the malware sub-resource to the SafeBrowsing servers if we have a
   // malware sub-resource on a safe page and only if the user has opted in to
   // reporting statistics.
   const MetricsService* metrics = g_browser_process->metrics_service();
   DCHECK(metrics);
   if (metrics && metrics->reporting_active() &&
-      resource.resource_type != ResourceType::MAIN_FRAME &&
       resource.threat_type == SafeBrowsingService::URL_MALWARE) {
     GURL page_url = wc->GetURL();
     GURL referrer_url;
     NavigationEntry* entry = wc->controller().GetActiveEntry();
     if (entry)
       referrer_url = entry->referrer();
-    ChromeThread::PostTask(
-        ChromeThread::IO, FROM_HERE,
-        NewRunnableMethod(this,
-                          &SafeBrowsingService::ReportMalware,
-                          resource.url,
-                          page_url,
-                          referrer_url));
+
+    if (resource.url != page_url || !referrer_url.is_empty()) {
+      bool is_subresource = resource.resource_type != ResourceType::MAIN_FRAME;
+      ChromeThread::PostTask(
+          ChromeThread::IO, FROM_HERE,
+          NewRunnableMethod(this,
+                            &SafeBrowsingService::ReportMalware,
+                            resource.url,
+                            page_url,
+                            referrer_url,
+                            is_subresource));
+    }
   }
 
   SafeBrowsingBlockingPage::ShowBlockingPage(this, resource);
 }
 
 void SafeBrowsingService::ReportMalware(const GURL& malware_url,
                                         const GURL& page_url,
-                                        const GURL& referrer_url) {
+                                        const GURL& referrer_url,
+                                        bool is_subresource) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
   if (!enabled_)
     return;
 
   if (DatabaseAvailable()) {
     // Check if 'page_url' is already blacklisted (exists in our cache). Only
-    // report if it's not there.
+    // report if it's not there. This can happen if the user has ignored
+    // the warning for page_url and is now hitting a warning for a resource.
     std::string list;
     std::vector<SBPrefix> prefix_hits;
     std::vector<SBFullHashResult> full_hits;
     database_->ContainsUrl(page_url, &list, &prefix_hits, &full_hits,
                            protocol_manager_->last_update());
     if (!full_hits.empty())
       return;
   }
 
-  protocol_manager_->ReportMalware(malware_url, page_url, referrer_url);
+  protocol_manager_->ReportMalware(malware_url, page_url, referrer_url,
+                                   is_subresource);
 }