content: ResourceType cleanup.

content/public/browser/resource_request_info.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 CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_
 #define CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "content/public/common/page_transition_types.h"
@@ skipping 12 matching lines @@
 // ResourceRequestInfo instance associated with it.
 class ResourceRequestInfo {
  public:
   // Returns the ResourceRequestInfo associated with the given URLRequest.
   CONTENT_EXPORT static const ResourceRequestInfo* ForRequest(
       const net::URLRequest* request);
 
   // Allocates a new, dummy ResourceRequestInfo and associates it with the
   // given URLRequest.
   // NOTE: Add more parameters if you need to initialize other fields.
-  CONTENT_EXPORT static void AllocateForTesting(
-      net::URLRequest* request,
-      ResourceType::Type resource_type,
-      ResourceContext* context,
-      int render_process_id,
-      int render_view_id,
-      int render_frame_id,
-      bool is_async);
+  CONTENT_EXPORT static void AllocateForTesting(net::URLRequest* request,
+                                                ResourceType resource_type,
+                                                ResourceContext* context,
+                                                int render_process_id,
+                                                int render_view_id,
+                                                int render_frame_id,
+                                                bool is_async);
 
   // Returns the associated RenderFrame for a given process. Returns false, if
   // there is no associated RenderFrame. This method does not rely on the
   // request being allocated by the ResourceDispatcherHost, but works for all
   // URLRequests that are associated with a RenderFrame.
   CONTENT_EXPORT static bool GetRenderFrameForRequest(
       const net::URLRequest* request,
       int* render_process_id,
       int* render_frame_id);
 
@@ skipping 24 matching lines @@
   virtual bool IsMainFrame() const = 0;
 
   // True if GetParentRenderFrameID() represents a main frame in the RenderView.
   virtual bool ParentIsMainFrame() const = 0;
 
   // Routing ID of parent frame of frame that sent this resource request.
   // -1 if unknown / invalid.
   virtual int GetParentRenderFrameID() const = 0;
 
   // Returns the associated resource type.
-  virtual ResourceType::Type GetResourceType() const = 0;
+  virtual ResourceType GetResourceType() const = 0;
 
   // Returns the process type that initiated this request.
   virtual int GetProcessType() const = 0;
 
   // Returns the associated referrer policy.
   virtual blink::WebReferrerPolicy GetReferrerPolicy() const = 0;
 
   // Returns the associated visibility state at the time the request was started
   // in the renderer.
   virtual blink::WebPageVisibilityState GetVisibilityState() const = 0;
@@ skipping 19 matching lines @@
   // Whether this is a download.
   virtual bool IsDownload() const = 0;
 
  protected:
   virtual ~ResourceRequestInfo() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_RESOURCE_REQUEST_INFO_H_