Move resource_type.* from webkit/ to content/.

content/public/common/resource_type.h

 // Copyright (c) 2012 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.
 
-#ifndef WEBKIT_COMMON_RESOURCE_TYPE_H__
-#define WEBKIT_COMMON_RESOURCE_TYPE_H__
+#ifndef CONTENT_PUBLIC_COMMON_RESOURCE_TYPE_H_
+#define CONTENT_PUBLIC_COMMON_RESOURCE_TYPE_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
+#include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "webkit/common/webkit_common_export.h"
 
-class ResourceType {
+namespace content {
+
+class CONTENT_EXPORT ResourceType {
  public:
   // Used in histograms, so please add new types at the end, and rename unused
   // entries to RESOURCETYPE_UNUSED_0, etc...
   enum Type {
     MAIN_FRAME = 0,  // top level page

[jam, 2014/07/14 15:16:31]

now that this is in content/public, it should conform to the Content API's
guidelines for enums (see
http://www.chromium.org/developers/content-module/content-api).

i.e. this should be 

enum ResourceType {
  RESOURCE_TYPE_MAIN_FRAME = 0,  //...
  RESOURCE_TYPE_SUB_FRAME,  // ...
  RESOURCE_TYPE_STYLESHEET,  // ...
.
.
.
};

For the methods below, they should be moved out:
-FromTargetType is only called from within content (child & renderer), so it
should be moved to content/child/target_type_conversion.h/cc (or similar, just a
proposed file name)
-ValidType/FromInt/IsSubresource aren't called from anywhere so they can be
removed
-IsSharedWorker/IsServiceWorker are not necessary, they're just an enum
comparison and are only called in 5 places. so remove them and just have the
source code do the if check
-IsFrame is called in a number of places, so probably best to leave it in this
header as a function. since it's not scoped in a class anymore, it would need a
more descriptive name. something like
bool IsResourceTypeFrame(ResourceType resource_type);

[tfarina, 2014/07/27 23:50:02]

Hi John,

I will be addressing this here -> https://codereview.chromium.org/425653002

Thanks for the analysis.

I didn't expect so many usages of ResourceType:: :-/

So it will take a while until I can get it all, but I will get there. 

     SUB_FRAME,       // frame or iframe
     STYLESHEET,      // a CSS stylesheet
     SCRIPT,          // an external script
     IMAGE,           // an image (jpg/gif/png/etc)
     FONT_RESOURCE,   // a font
     SUB_RESOURCE,    // an "other" subresource.
     OBJECT,          // an object (or embed) tag for a plugin,
                      // or a resource that a plugin requested.
     MEDIA,           // a media resource.
     WORKER,          // the main resource of a dedicated worker.
     SHARED_WORKER,   // the main resource of a shared worker.
     PREFETCH,        // an explicitly requested prefetch
     FAVICON,         // a favicon
     XHR,             // a XMLHttpRequest
     PING,            // a ping request for <a ping>
     SERVICE_WORKER,  // the main resource of a service worker.
     LAST_TYPE        // Place holder so we don't need to change ValidType
                      // everytime.
   };
 
+  static Type FromTargetType(blink::WebURLRequest::TargetType type);
+
   static bool ValidType(int32 type) {
     return type >= MAIN_FRAME && type < LAST_TYPE;
   }
 
   static Type FromInt(int32 type) {
     return static_cast<Type>(type);
   }
 
-  WEBKIT_COMMON_EXPORT static Type FromTargetType(
-      blink::WebURLRequest::TargetType type);
-
   static bool IsFrame(ResourceType::Type type) {
     return type == MAIN_FRAME || type == SUB_FRAME;
   }
 
   static bool IsSharedWorker(ResourceType::Type type) {
     return type == SHARED_WORKER;
   }
 
   static bool IsServiceWorker(ResourceType::Type type) {
     return type == SERVICE_WORKER;
   }
 
   static bool IsSubresource(ResourceType::Type type) {
     return type == STYLESHEET ||
            type == SCRIPT ||
            type == IMAGE ||
            type == FONT_RESOURCE ||
            type == SUB_RESOURCE ||
            type == WORKER ||
            type == XHR;
   }
 
  private:
-  // Don't instantiate this class.
-  ResourceType();
-  ~ResourceType();
+  DISALLOW_COPY_AND_ASSIGN(ResourceType);
 };
-#endif  // WEBKIT_COMMON_RESOURCE_TYPE_H__
+
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_COMMON_RESOURCE_TYPE_H_