Get ResourceType from WebURLRequest rather than TargetType.

'WebURLRequest::TargetType' has been dropped in Blink in favor of
'RequestContext' and 'FrameType', matching the Fetch specification's
changes, and allowing both more granularity in various Blink-side checks
and more clarity around the thing that caused a request, and the frame
that the request affects.

This CL should have zero practical effect, as it's simply hoisting the
translation work that 'WebURLRequest::targetType' is already doing
up into the content layer to bring us one step closer to removing the
concept entirely.

BUG=390497

Review URL: https://codereview.chromium.org/409593002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284924 0039d316-1c4b-4281-b951-d872f2087c98

content/child/web_url_loader_impl.cc

@@ -387,8 +387,7 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
   // the render process, so we can use requestorProcessID even for requests
   // from in-process plugins.
   request_info.requestor_pid = request.requestorProcessID();
-  request_info.request_type =
-      ResourceType::FromTargetType(request.targetType());
+  request_info.request_type = ResourceType::FromWebURLRequest(request);
   request_info.priority =
       ConvertWebKitPriorityToNetPriority(request.priority());
   request_info.appcache_host_id = request.appCacheHostID();

content/public/common/resource_type.cc

@@ -11,45 +11,111 @@ using blink::WebURLRequest;
 namespace content {
 
 // static
-ResourceType::Type ResourceType::FromTargetType(
-    WebURLRequest::TargetType type) {
-  switch (type) {
-    case WebURLRequest::TargetIsMainFrame:
+ResourceType::Type ResourceType::FromWebURLRequest(
+    const WebURLRequest& request) {
+  WebURLRequest::RequestContext requestContext = request.requestContext();
+  if (request.frameType() != WebURLRequest::FrameTypeNone) {
+    DCHECK(requestContext == WebURLRequest::RequestContextForm ||
+           requestContext == WebURLRequest::RequestContextFrame ||
+           requestContext == WebURLRequest::RequestContextHyperlink ||
+           requestContext == WebURLRequest::RequestContextIframe ||
+           requestContext == WebURLRequest::RequestContextInternal ||
+           requestContext == WebURLRequest::RequestContextLocation);
+    if (request.frameType() == WebURLRequest::FrameTypeTopLevel ||
+        request.frameType() == WebURLRequest::FrameTypeAuxiliary) {
       return ResourceType::MAIN_FRAME;
-    case WebURLRequest::TargetIsSubframe:
+    }
+    if (request.frameType() == WebURLRequest::FrameTypeNested)
       return ResourceType::SUB_FRAME;
-    case WebURLRequest::TargetIsSubresource:
-      return ResourceType::SUB_RESOURCE;
-    case WebURLRequest::TargetIsStyleSheet:
-      return ResourceType::STYLESHEET;
-    case WebURLRequest::TargetIsScript:
-      return ResourceType::SCRIPT;
-    case WebURLRequest::TargetIsFontResource:
+    NOTREACHED();
+    return ResourceType::SUB_RESOURCE;
+  }
+
+  switch (requestContext) {
+    // Favicon
+    case WebURLRequest::RequestContextFavicon:
+      return ResourceType::FAVICON;
+
+    // Font
+    case WebURLRequest::RequestContextFont:
       return ResourceType::FONT_RESOURCE;
-    case WebURLRequest::TargetIsImage:
+
+    // Image
+    case WebURLRequest::RequestContextImage:
       return ResourceType::IMAGE;
-    case WebURLRequest::TargetIsObject:
+
+    // Media
+    case WebURLRequest::RequestContextAudio:
+    case WebURLRequest::RequestContextVideo:
+      return ResourceType::MEDIA;
+
+    // Object
+    case WebURLRequest::RequestContextEmbed:
+    case WebURLRequest::RequestContextObject:
       return ResourceType::OBJECT;
-    case WebURLRequest::TargetIsMedia:
+
+    // Ping
+    case WebURLRequest::RequestContextBeacon:
+    case WebURLRequest::RequestContextCSPReport:
+    case WebURLRequest::RequestContextPing:
+      return ResourceType::PING;
+
+    // Prefetch
+    case WebURLRequest::RequestContextPrefetch:
+      return ResourceType::PREFETCH;
+
+    // Script
+    case WebURLRequest::RequestContextScript:
+      return ResourceType::SCRIPT;
+
+    // Style
+    case WebURLRequest::RequestContextXSLT:
+    case WebURLRequest::RequestContextStyle:
+      return ResourceType::STYLESHEET;
+
+    // Subresource
+    case WebURLRequest::RequestContextDownload:
+    case WebURLRequest::RequestContextManifest:
+    case WebURLRequest::RequestContextSubresource:
+    case WebURLRequest::RequestContextPlugin:
+      return ResourceType::SUB_RESOURCE;
+
+    // TextTrack
+    case WebURLRequest::RequestContextTrack:
       return ResourceType::MEDIA;
-    case WebURLRequest::TargetIsWorker:
-      return ResourceType::WORKER;
-    case WebURLRequest::TargetIsSharedWorker:
+
+    // Workers
+    case WebURLRequest::RequestContextServiceWorker:
+      return ResourceType::SERVICE_WORKER;
+    case WebURLRequest::RequestContextSharedWorker:
       return ResourceType::SHARED_WORKER;
-    case WebURLRequest::TargetIsPrefetch:
-      return ResourceType::PREFETCH;
-    case WebURLRequest::TargetIsFavicon:
-      return ResourceType::FAVICON;
-    case WebURLRequest::TargetIsXHR:
+    case WebURLRequest::RequestContextWorker:
+      return ResourceType::WORKER;
+
+    // Unspecified
+    case WebURLRequest::RequestContextInternal:
+    case WebURLRequest::RequestContextUnspecified:
+      return ResourceType::SUB_RESOURCE;
+
+    // XHR
+    case WebURLRequest::RequestContextEventSource:
+    case WebURLRequest::RequestContextFetch:
+    case WebURLRequest::RequestContextXMLHttpRequest:
       return ResourceType::XHR;
-    case WebURLRequest::TargetIsPing:
-      return ResourceType::PING;
-    case WebURLRequest::TargetIsServiceWorker:
-      return ResourceType::SERVICE_WORKER;
-    default:
+
+    // These should be handled by the FrameType checks at the top of the
+    // function.
+    // Main Frame
+    case WebURLRequest::RequestContextForm:
+    case WebURLRequest::RequestContextHyperlink:
+    case WebURLRequest::RequestContextLocation:
+    case WebURLRequest::RequestContextFrame:
+    case WebURLRequest::RequestContextIframe:
       NOTREACHED();
       return ResourceType::SUB_RESOURCE;
   }
+  NOTREACHED();
+  return ResourceType::SUB_RESOURCE;
 }
 
 }  // namespace content

content/public/common/resource_type.h

@@ -37,7 +37,7 @@ class CONTENT_EXPORT ResourceType {
                      // everytime.
   };
 
-  static Type FromTargetType(blink::WebURLRequest::TargetType type);
+  static Type FromWebURLRequest(const blink::WebURLRequest& request);
 
   static bool ValidType(int32 type) {
     return type >= MAIN_FRAME && type < LAST_TYPE;

content/renderer/render_frame_impl.cc

@@ -2627,7 +2627,7 @@ void RenderFrameImpl::didLoadResourceFromMemoryCache(
       response.securityInfo(),
       request.httpMethod().utf8(),
       response.mimeType().utf8(),
-      ResourceType::FromTargetType(request.targetType())));
+      ResourceType::FromWebURLRequest(request)));
 }
 
 void RenderFrameImpl::didDisplayInsecureContent(blink::WebLocalFrame* frame) {