content: ResourceType cleanup.

content/child/resource_dispatcher.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #ifndef CONTENT_CHILD_RESOURCE_DISPATCHER_H_
 #define CONTENT_CHILD_RESOURCE_DISPATCHER_H_
 
 #include <deque>
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/public/common/resource_type.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "net/base/request_priority.h"
+#include "url/gurl.h"
 
 struct ResourceMsg_RequestCompleteData;
 
 namespace blink {
 class WebThreadedDataReceiver;
 }
 
 namespace webkit_glue {
 class ResourceLoaderBridge;
 }
@@ skipping 20 matching lines @@
 
   // Creates a ResourceLoaderBridge for this type of dispatcher, this is so
   // this can be tested regardless of the ResourceLoaderBridge::Create
   // implementation.  Virtual for tests.
   virtual webkit_glue::ResourceLoaderBridge* CreateBridge(
       const RequestInfo& request_info);
 
   // Adds a request from the |pending_requests_| list, returning the new
   // requests' ID.
   int AddPendingRequest(RequestPeer* callback,
-                        ResourceType::Type resource_type,
+                        ResourceType resource_type,
                         int origin_pid,
                         const GURL& frame_origin,
                         const GURL& request_url,
                         bool download_to_file);
 
   // Removes a request from the |pending_requests_| list, returning true if the
   // request was found and removed.
   bool RemovePendingRequest(int request_id);
 
   // Cancels a request in the |pending_requests_| list.  The request will be
@@ skipping 27 matching lines @@
   }
 
  private:
   friend class ResourceDispatcherTest;
 
   typedef std::deque<IPC::Message*> MessageQueue;
   struct PendingRequestInfo {
     PendingRequestInfo();
 
     PendingRequestInfo(RequestPeer* peer,
-                       ResourceType::Type resource_type,
+                       ResourceType resource_type,
                        int origin_pid,
                        const GURL& frame_origin,
                        const GURL& request_url,
                        bool download_to_file);
 
     ~PendingRequestInfo();
 
     RequestPeer* peer;
     ThreadedDataProvider* threaded_data_provider;
-    ResourceType::Type resource_type;
+    ResourceType resource_type;
     // The PID of the original process which issued this request. This gets
     // non-zero only for a request proxied by another renderer, particularly
     // requests from plugins.
     int origin_pid;
     MessageQueue deferred_message_queue;
     bool is_deferred;
     // Original requested url.
     GURL url;
     // The security origin of the frame that initiates this request.
     GURL frame_origin;
@@ skipping 84 matching lines @@
 
   // IO thread timestamp for ongoing IPC message.
   base::TimeTicks io_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_RESOURCE_DISPATCHER_H_