WebRequest API: add more resource types

content/child/web_url_request_util.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 "content/child/web_url_request_util.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
@@ skipping 69 matching lines @@
         request.frameType() == WebURLRequest::FrameTypeAuxiliary) {
       return RESOURCE_TYPE_MAIN_FRAME;
     }
     if (request.frameType() == WebURLRequest::FrameTypeNested)
       return RESOURCE_TYPE_SUB_FRAME;
     NOTREACHED();
     return RESOURCE_TYPE_SUB_RESOURCE;
   }
 
   switch (requestContext) {
+    // CSP report
+    case WebURLRequest::RequestContextCSPReport:
+      return RESOURCE_TYPE_CSP_REPORT;
+
     // Favicon
     case WebURLRequest::RequestContextFavicon:
       return RESOURCE_TYPE_FAVICON;
 
     // Font
     case WebURLRequest::RequestContextFont:
       return RESOURCE_TYPE_FONT_RESOURCE;
 
     // Image
     case WebURLRequest::RequestContextImage:
     case WebURLRequest::RequestContextImageSet:
       return RESOURCE_TYPE_IMAGE;
 
     // Media
     case WebURLRequest::RequestContextAudio:
     case WebURLRequest::RequestContextVideo:
       return RESOURCE_TYPE_MEDIA;
 
     // Object
     case WebURLRequest::RequestContextEmbed:
     case WebURLRequest::RequestContextObject:
       return RESOURCE_TYPE_OBJECT;
 
     // Ping
     case WebURLRequest::RequestContextBeacon:
-    case WebURLRequest::RequestContextCSPReport:
     case WebURLRequest::RequestContextPing:
       return RESOURCE_TYPE_PING;
 
     // Prefetch
     case WebURLRequest::RequestContextPrefetch:
       return RESOURCE_TYPE_PREFETCH;
 
     // Script
     case WebURLRequest::RequestContextImport:
     case WebURLRequest::RequestContextScript:
       return RESOURCE_TYPE_SCRIPT;
 
     // Style
     case WebURLRequest::RequestContextXSLT:
     case WebURLRequest::RequestContextStyle:
       return RESOURCE_TYPE_STYLESHEET;
 
     // Subresource
     case WebURLRequest::RequestContextDownload:
     case WebURLRequest::RequestContextManifest:
     case WebURLRequest::RequestContextSubresource:
+      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_SUB_RESOURCE;
+      return RESOURCE_TYPE_PLUGIN_RESOURCE;
 
     // TextTrack
     case WebURLRequest::RequestContextTrack:
       return RESOURCE_TYPE_MEDIA;
 
     // Workers
     case WebURLRequest::RequestContextServiceWorker:
       return RESOURCE_TYPE_SERVICE_WORKER;
     case WebURLRequest::RequestContextSharedWorker:
       return RESOURCE_TYPE_SHARED_WORKER;
@@ skipping 285 matching lines @@
                                      bool stale_copy_in_cache,
                                      int reason,
                                      bool was_ignored_by_handler) {
   blink::WebURLError error =
       CreateWebURLError(unreachable_url, stale_copy_in_cache, reason);
   error.wasIgnoredByHandler = was_ignored_by_handler;
   return error;
 }
 
 }  // namespace content