WebRequest API: add more resource types

chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc

 // Copyright 2014 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/incident_reporting/off_domain_inclusion_detector.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 127 matching lines @@
       // Only analyze top-level frames within the main frame.
       return request_info->ParentIsMainFrame();
     case content::RESOURCE_TYPE_STYLESHEET:
     case content::RESOURCE_TYPE_SCRIPT:
     case content::RESOURCE_TYPE_IMAGE:
     case content::RESOURCE_TYPE_FONT_RESOURCE:
     case content::RESOURCE_TYPE_SUB_RESOURCE:
     case content::RESOURCE_TYPE_OBJECT:
     case content::RESOURCE_TYPE_MEDIA:
     case content::RESOURCE_TYPE_XHR:
+    case content::RESOURCE_TYPE_PLUGIN_RESOURCE:
       // Types above are to be analyzed for off-domain inclusion if they are
       // loaded as part of the main frame.
       return request_info->IsMainFrame();
     case content::RESOURCE_TYPE_WORKER:
     case content::RESOURCE_TYPE_SHARED_WORKER:
     case content::RESOURCE_TYPE_PREFETCH:
     case content::RESOURCE_TYPE_FAVICON:
     case content::RESOURCE_TYPE_PING:
     case content::RESOURCE_TYPE_SERVICE_WORKER:
+    case content::RESOURCE_TYPE_CSP_REPORT:
       // Types above are not to be analyzed for off-domain inclusion.
       return false;
     case content::RESOURCE_TYPE_LAST_TYPE:
       NOTREACHED();
       break;
   }
   NOTREACHED();
   return false;
 }
 
@@ skipping 137 matching lines @@
   }
 }
 
 void OffDomainInclusionDetector::ReportAnalysisResult(
     scoped_ptr<const OffDomainInclusionInfo> off_domain_inclusion_info,
     AnalysisEvent analysis_event) {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
 
   // Always record this histogram for the resource type analyzed to be able to
   // do ratio analysis w.r.t. other histograms below.
-  UMA_HISTOGRAM_ENUMERATION("SBOffDomainInclusion.RequestAnalyzed",
+  UMA_HISTOGRAM_ENUMERATION("SBOffDomainInclusion2.RequestAnalyzed",
                             off_domain_inclusion_info->resource_type,
                             content::RESOURCE_TYPE_LAST_TYPE);
 
   // Log a histogram for the analysis result along with the associated
   // ResourceType.
   std::string histogram_name;
   switch (analysis_event) {
     case AnalysisEvent::NO_EVENT:
       break;
     case AnalysisEvent::ABORT_EMPTY_MAIN_FRAME_URL:
-      histogram_name = "SBOffDomainInclusion.Abort.EmptyMainFrameURL";
+      histogram_name = "SBOffDomainInclusion2.Abort.EmptyMainFrameURL";
       break;
     case AnalysisEvent::ABORT_NO_PROFILE:
-      histogram_name = "SBOffDomainInclusion.Abort.NoProfile";
+      histogram_name = "SBOffDomainInclusion2.Abort.NoProfile";
       break;
     case AnalysisEvent::ABORT_INCOGNITO:
-      histogram_name = "SBOffDomainInclusion.Abort.Incognito";
+      histogram_name = "SBOffDomainInclusion2.Abort.Incognito";
       break;
     case AnalysisEvent::ABORT_NO_HISTORY_SERVICE:
-      histogram_name = "SBOffDomainInclusion.Abort.NoHistoryService";
+      histogram_name = "SBOffDomainInclusion2.Abort.NoHistoryService";
       break;
     case AnalysisEvent::ABORT_HISTORY_LOOKUP_FAILED:
-      histogram_name = "SBOffDomainInclusion.Abort.HistoryLookupFailed";
+      histogram_name = "SBOffDomainInclusion2.Abort.HistoryLookupFailed";
       break;
     case AnalysisEvent::OFF_DOMAIN_INCLUSION_WHITELISTED:
-      histogram_name = "SBOffDomainInclusion.Whitelisted";
+      histogram_name = "SBOffDomainInclusion2.Whitelisted";
       break;
     case AnalysisEvent::OFF_DOMAIN_INCLUSION_IN_HISTORY:
-      histogram_name = "SBOffDomainInclusion.InHistory";
+      histogram_name = "SBOffDomainInclusion2.InHistory";
       break;
     case AnalysisEvent::OFF_DOMAIN_INCLUSION_SUSPICIOUS:
-      histogram_name = "SBOffDomainInclusion.Suspicious";
+      histogram_name = "SBOffDomainInclusion2.Suspicious";
       break;
   }
   if (!histogram_name.empty()) {
     // Expanded from the UMA_HISTOGRAM_ENUMERATION macro.
     base::LinearHistogram::FactoryGet(
         histogram_name,
         1,                                     // minimum,
         content::RESOURCE_TYPE_LAST_TYPE,      // maximum
         content::RESOURCE_TYPE_LAST_TYPE + 1,  // bucket_count
         base::HistogramBase::kUmaTargetedHistogramFlag)
         ->Add(off_domain_inclusion_info->resource_type);
   }
 
   if (!report_analysis_event_callback_.is_null() &&
       analysis_event != AnalysisEvent::NO_EVENT) {
     report_analysis_event_callback_.Run(analysis_event);
   }
 }
 
 }  // namespace safe_browsing