content: ResourceType cleanup.

content/child/web_url_request_util.cc

Index: content/child/web_url_request_util.cc
diff --git a/content/public/common/resource_type.cc b/content/child/web_url_request_util.cc
similarity index 75%
copy from content/public/common/resource_type.cc
copy to content/child/web_url_request_util.cc
index 0921eb5f8321313940567fd63621638afcef1c27..be5ee32ba2d852cc7e26824466064285799a544a 100644
--- a/content/public/common/resource_type.cc
+++ b/content/child/web_url_request_util.cc
@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/public/common/resource_type.h"
+#include "content/child/web_url_request_util.h"
 
 #include "base/logging.h"
+#include "third_party/WebKit/public/platform/WebURLRequest.h"
 
 using blink::WebURLRequest;
 
 namespace content {
 
-// static
-ResourceType::Type ResourceType::FromWebURLRequest(
-    const WebURLRequest& request) {
+ResourceType WebURLRequestToResourceType(const WebURLRequest& request) {
   WebURLRequest::RequestContext requestContext = request.requestContext();
   if (request.frameType() != WebURLRequest::FrameTypeNone) {
     DCHECK(requestContext == WebURLRequest::RequestContextForm ||
@@ -23,85 +22,85 @@ ResourceType::Type ResourceType::FromWebURLRequest(
            requestContext == WebURLRequest::RequestContextLocation);
     if (request.frameType() == WebURLRequest::FrameTypeTopLevel ||
         request.frameType() == WebURLRequest::FrameTypeAuxiliary) {
-      return ResourceType::MAIN_FRAME;
+      return RESOURCE_TYPE_MAIN_FRAME;
     }
     if (request.frameType() == WebURLRequest::FrameTypeNested)
-      return ResourceType::SUB_FRAME;
+      return RESOURCE_TYPE_SUB_FRAME;
     NOTREACHED();
-    return ResourceType::SUB_RESOURCE;
+    return RESOURCE_TYPE_SUB_RESOURCE;
   }
 
   switch (requestContext) {
     // Favicon
     case WebURLRequest::RequestContextFavicon:
-      return ResourceType::FAVICON;
+      return RESOURCE_TYPE_FAVICON;
 
     // Font
     case WebURLRequest::RequestContextFont:
-      return ResourceType::FONT_RESOURCE;
+      return RESOURCE_TYPE_FONT_RESOURCE;
 
     // Image
     case WebURLRequest::RequestContextImage:
-      return ResourceType::IMAGE;
+      return RESOURCE_TYPE_IMAGE;
 
     // Media
     case WebURLRequest::RequestContextAudio:
     case WebURLRequest::RequestContextVideo:
-      return ResourceType::MEDIA;
+      return RESOURCE_TYPE_MEDIA;
 
     // Object
     case WebURLRequest::RequestContextEmbed:
     case WebURLRequest::RequestContextObject:
-      return ResourceType::OBJECT;
+      return RESOURCE_TYPE_OBJECT;
 
     // Ping
     case WebURLRequest::RequestContextBeacon:
     case WebURLRequest::RequestContextCSPReport:
     case WebURLRequest::RequestContextPing:
-      return ResourceType::PING;
+      return RESOURCE_TYPE_PING;
 
     // Prefetch
     case WebURLRequest::RequestContextPrefetch:
-      return ResourceType::PREFETCH;
+      return RESOURCE_TYPE_PREFETCH;
 
     // Script
     case WebURLRequest::RequestContextScript:
-      return ResourceType::SCRIPT;
+      return RESOURCE_TYPE_SCRIPT;
 
     // Style
     case WebURLRequest::RequestContextXSLT:
     case WebURLRequest::RequestContextStyle:
-      return ResourceType::STYLESHEET;
+      return RESOURCE_TYPE_STYLESHEET;
 
     // Subresource
     case WebURLRequest::RequestContextDownload:
     case WebURLRequest::RequestContextManifest:
     case WebURLRequest::RequestContextSubresource:
     case WebURLRequest::RequestContextPlugin:
-      return ResourceType::SUB_RESOURCE;
+      return RESOURCE_TYPE_SUB_RESOURCE;
 
     // TextTrack
     case WebURLRequest::RequestContextTrack:
-      return ResourceType::MEDIA;
+      return RESOURCE_TYPE_MEDIA;
 
     // Workers
     case WebURLRequest::RequestContextServiceWorker:
-      return ResourceType::SERVICE_WORKER;
+      return RESOURCE_TYPE_SERVICE_WORKER;
     case WebURLRequest::RequestContextSharedWorker:
-      return ResourceType::SHARED_WORKER;
+      return RESOURCE_TYPE_SHARED_WORKER;
     case WebURLRequest::RequestContextWorker:
-      return ResourceType::WORKER;
+      return RESOURCE_TYPE_WORKER;
 
     // Unspecified
     case WebURLRequest::RequestContextInternal:
     case WebURLRequest::RequestContextUnspecified:
-      return ResourceType::SUB_RESOURCE;
+      return RESOURCE_TYPE_SUB_RESOURCE;
 
     // XHR
     case WebURLRequest::RequestContextEventSource:
     case WebURLRequest::RequestContextFetch:
     case WebURLRequest::RequestContextXMLHttpRequest:
-      return ResourceType::XHR;
+      return RESOURCE_TYPE_XHR;
 
     // These should be handled by the FrameType checks at the top of the
     // function.
@@ -112,10 +111,10 @@ ResourceType::Type ResourceType::FromWebURLRequest(
     case WebURLRequest::RequestContextFrame:
     case WebURLRequest::RequestContextIframe:
       NOTREACHED();
-      return ResourceType::SUB_RESOURCE;
+      return RESOURCE_TYPE_SUB_RESOURCE;
   }
   NOTREACHED();
-  return ResourceType::SUB_RESOURCE;
+  return RESOURCE_TYPE_SUB_RESOURCE;
 }
 
 }  // namespace content