| Index: content/child/resource_dispatcher.h
|
| diff --git a/content/child/resource_dispatcher.h b/content/child/resource_dispatcher.h
|
| index 4943765b70161fe972007ccd9ecf9dc8627860b6..2c8a0a98036243b2db307f4599aa7351b8f99cca 100644
|
| --- a/content/child/resource_dispatcher.h
|
| +++ b/content/child/resource_dispatcher.h
|
| @@ -16,9 +16,9 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| #include "content/common/content_export.h"
|
| +#include "content/public/child/resource_loader_bridge.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ipc/ipc_sender.h"
|
| -#include "webkit/child/resource_loader_bridge.h"
|
|
|
| struct ResourceMsg_RequestCompleteData;
|
|
|
| @@ -40,12 +40,12 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
| // Creates a ResourceLoaderBridge for this type of dispatcher, this is so
|
| // this can be tested regardless of the ResourceLoaderBridge::Create
|
| // implementation.
|
| - webkit_glue::ResourceLoaderBridge* CreateBridge(
|
| - const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info);
|
| + ResourceLoaderBridge* CreateBridge(
|
| + const ResourceLoaderBridge::RequestInfo& request_info);
|
|
|
| // Adds a request from the pending_requests_ list, returning the new
|
| // requests' ID
|
| - int AddPendingRequest(webkit_glue::ResourceLoaderBridge::Peer* callback,
|
| + int AddPendingRequest(ResourceLoaderBridge::Peer* callback,
|
| ResourceType::Type resource_type,
|
| int origin_pid,
|
| const GURL& frame_origin,
|
| @@ -87,7 +87,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
| struct PendingRequestInfo {
|
| PendingRequestInfo();
|
|
|
| - PendingRequestInfo(webkit_glue::ResourceLoaderBridge::Peer* peer,
|
| + PendingRequestInfo(ResourceLoaderBridge::Peer* peer,
|
| ResourceType::Type resource_type,
|
| int origin_pid,
|
| const GURL& frame_origin,
|
| @@ -95,7 +95,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
|
|
|
| ~PendingRequestInfo();
|
|
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer;
|
| + ResourceLoaderBridge::Peer* peer;
|
| ResourceType::Type 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
|
|
|