Index: chrome/renderer/security_filter_peer.h |
diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h |
index ca98e1856c90190dc40bebab87cf053b692edabc..15bef29dbf1a66ab8c4bc7175785be18371815b3 100644 |
--- a/chrome/renderer/security_filter_peer.h |
+++ b/chrome/renderer/security_filter_peer.h |
@@ -9,10 +9,6 @@ |
#include "webkit/common/resource_response_info.h" |
#include "webkit/common/resource_type.h" |
-namespace webkit_glue { |
-class ResourceLoaderBridge; |
-} |
- |
// The SecurityFilterPeer is a proxy to a |
// content::RequestPeer instance. It is used to pre-process |
// unsafe resources (such as mixed-content resource). |
@@ -53,11 +49,9 @@ class SecurityFilterPeer : public content::RequestPeer { |
int64 total_transfer_size) OVERRIDE; |
protected: |
- SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge, |
- content::RequestPeer* peer); |
+ explicit SecurityFilterPeer(content::RequestPeer* peer); |
content::RequestPeer* original_peer_; |
- webkit_glue::ResourceLoaderBridge* resource_loader_bridge_; |
private: |
DISALLOW_COPY_AND_ASSIGN(SecurityFilterPeer); |
@@ -67,9 +61,7 @@ class SecurityFilterPeer : public content::RequestPeer { |
// Subclasses should implement DataReady() to process the data as necessary. |
class BufferedPeer : public SecurityFilterPeer { |
public: |
- BufferedPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge, |
- content::RequestPeer* peer, |
- const std::string& mime_type); |
+ BufferedPeer(content::RequestPeer* peer, const std::string& mime_type); |
virtual ~BufferedPeer(); |
// content::RequestPeer Implementation. |
@@ -104,16 +96,13 @@ class BufferedPeer : public SecurityFilterPeer { |
// The ReplaceContentPeer cancels the request and serves the provided data as |
// content instead. |
-// TODO(jcampan): we do not as of now cancel the request, as we do not have |
-// access to the resource_loader_bridge in the SecurityFilterPeer factory |
-// method. For now the resource is still being fetched, but ignored, as once |
-// we have provided the replacement content, the associated pending request |
+// TODO(jcampan): For now the resource is still being fetched, but ignored, as |
+// once we have provided the replacement content, the associated pending request |
// in ResourceDispatcher is removed and further OnReceived* notifications are |
// ignored. |
class ReplaceContentPeer : public SecurityFilterPeer { |
public: |
- ReplaceContentPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge, |
- content::RequestPeer* peer, |
+ ReplaceContentPeer(content::RequestPeer* peer, |
const std::string& mime_type, |
const std::string& data); |
virtual ~ReplaceContentPeer(); |
@@ -124,13 +113,12 @@ class ReplaceContentPeer : public SecurityFilterPeer { |
virtual void OnReceivedData(const char* data, |
int data_length, |
int encoded_data_length) OVERRIDE; |
- virtual void OnCompletedRequest( |
- int error_code, |
- bool was_ignored_by_handler, |
- bool stale_copy_in_cache, |
- const std::string& security_info, |
- const base::TimeTicks& completion_time, |
- int64 total_transfer_size) OVERRIDE; |
+ virtual void OnCompletedRequest(int error_code, |
+ bool was_ignored_by_handler, |
+ bool stale_copy_in_cache, |
+ const std::string& security_info, |
+ const base::TimeTicks& completion_time, |
+ int64 total_transfer_size) OVERRIDE; |
private: |
webkit_glue::ResourceResponseInfo response_info_; |