Index: chrome/renderer/security_filter_peer.h |
diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h |
index f67de712066c92e1884e53e1cbf2dba3205bebc7..77c8131967df4f7e75dba8f6484b0ffe00c70b68 100644 |
--- a/chrome/renderer/security_filter_peer.h |
+++ b/chrome/renderer/security_filter_peer.h |
@@ -5,26 +5,26 @@ |
#ifndef CHROME_RENDERER_SECURITY_FILTER_PEER_H_ |
#define CHROME_RENDERER_SECURITY_FILTER_PEER_H_ |
-#include "webkit/child/resource_loader_bridge.h" |
+#include "content/public/child/resource_loader_bridge.h" |
// The SecurityFilterPeer is a proxy to a |
-// webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process |
+// content::ResourceLoaderBridge::Peer instance. It is used to pre-process |
// unsafe resources (such as mixed-content resource). |
// Call the factory method CreateSecurityFilterPeer() to obtain an instance of |
// SecurityFilterPeer based on the original Peer. |
// NOTE: subclasses should insure they delete themselves at the end of the |
// OnReceiveComplete call. |
-class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer { |
+class SecurityFilterPeer : public content::ResourceLoaderBridge::Peer { |
public: |
virtual ~SecurityFilterPeer(); |
static SecurityFilterPeer* CreateSecurityFilterPeerForDeniedRequest( |
ResourceType::Type resource_type, |
- webkit_glue::ResourceLoaderBridge::Peer* peer, |
+ content::ResourceLoaderBridge::Peer* peer, |
int os_error); |
static SecurityFilterPeer* CreateSecurityFilterPeerForFrame( |
- webkit_glue::ResourceLoaderBridge::Peer* peer, |
+ content::ResourceLoaderBridge::Peer* peer, |
int os_error); |
// ResourceLoaderBridge::Peer methods. |
@@ -49,11 +49,11 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer { |
int64 total_transfer_size) OVERRIDE; |
protected: |
- SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge, |
- webkit_glue::ResourceLoaderBridge::Peer* peer); |
+ SecurityFilterPeer(content::ResourceLoaderBridge* resource_loader_bridge, |
+ content::ResourceLoaderBridge::Peer* peer); |
- webkit_glue::ResourceLoaderBridge::Peer* original_peer_; |
- webkit_glue::ResourceLoaderBridge* resource_loader_bridge_; |
+ content::ResourceLoaderBridge::Peer* original_peer_; |
+ content::ResourceLoaderBridge* resource_loader_bridge_; |
private: |
DISALLOW_COPY_AND_ASSIGN(SecurityFilterPeer); |
@@ -63,8 +63,8 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer { |
// Subclasses should implement DataReady() to process the data as necessary. |
class BufferedPeer : public SecurityFilterPeer { |
public: |
- BufferedPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge, |
- webkit_glue::ResourceLoaderBridge::Peer* peer, |
+ BufferedPeer(content::ResourceLoaderBridge* resource_loader_bridge, |
+ content::ResourceLoaderBridge::Peer* peer, |
const std::string& mime_type); |
virtual ~BufferedPeer(); |
@@ -108,8 +108,8 @@ class BufferedPeer : public SecurityFilterPeer { |
// ignored. |
class ReplaceContentPeer : public SecurityFilterPeer { |
public: |
- ReplaceContentPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge, |
- webkit_glue::ResourceLoaderBridge::Peer* peer, |
+ ReplaceContentPeer(content::ResourceLoaderBridge* resource_loader_bridge, |
+ content::ResourceLoaderBridge::Peer* peer, |
const std::string& mime_type, |
const std::string& data); |
virtual ~ReplaceContentPeer(); |