WebRequest API: add more resource types

content/child/web_url_request_util.cc

Index: content/child/web_url_request_util.cc
diff --git a/content/child/web_url_request_util.cc b/content/child/web_url_request_util.cc
index cf46ed417866e060ceb18bfb8f36ac0e1f2691fb..110353c1094916103a93d03582ee04966c452a6f 100644
--- a/content/child/web_url_request_util.cc
+++ b/content/child/web_url_request_util.cc
@@ -87,6 +87,10 @@ ResourceType WebURLRequestToResourceType(const WebURLRequest& request) {
   }
 
   switch (requestContext) {
+    // CSP report
+    case WebURLRequest::RequestContextCSPReport:
+      return RESOURCE_TYPE_CSP_REPORT;
+
     // Favicon
     case WebURLRequest::RequestContextFavicon:
       return RESOURCE_TYPE_FAVICON;
@@ -112,7 +116,6 @@ ResourceType WebURLRequestToResourceType(const WebURLRequest& request) {
 
     // Ping
     case WebURLRequest::RequestContextBeacon:
-    case WebURLRequest::RequestContextCSPReport:
     case WebURLRequest::RequestContextPing:
       return RESOURCE_TYPE_PING;
 
@@ -134,9 +137,12 @@ ResourceType WebURLRequestToResourceType(const WebURLRequest& request) {
     case WebURLRequest::RequestContextDownload:
     case WebURLRequest::RequestContextManifest:
     case WebURLRequest::RequestContextSubresource:
-    case WebURLRequest::RequestContextPlugin:
       return RESOURCE_TYPE_SUB_RESOURCE;
 
+    // Subresource of plugins

[Charlie Reis, 2015/12/14 20:53:23]

nit: List below TYPE_PING to be alphabetical.  (I realize there's some
exceptions below, but we might as well stick with the general trend for new
code.)

[robwu, 2015/12/15 13:17:25]

Done.

+    case WebURLRequest::RequestContextPlugin:
+      return RESOURCE_TYPE_PLUGIN_RESOURCE;
+
     // TextTrack
     case WebURLRequest::RequestContextTrack:
       return RESOURCE_TYPE_MEDIA;