Revert of Remove webkit's ResourceLoaderBridge interface.

chrome/renderer/security_filter_peer.h

 // Copyright (c) 2011 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 CHROME_RENDERER_SECURITY_FILTER_PEER_H_
 #define CHROME_RENDERER_SECURITY_FILTER_PEER_H_
 
 #include "content/public/child/request_peer.h"
 #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).
 // 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 content::RequestPeer {
  public:
   virtual ~SecurityFilterPeer();
@@ skipping 20 matching lines @@
                               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;
 
  protected:
-  explicit SecurityFilterPeer(content::RequestPeer* peer);
+  SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
+                     content::RequestPeer* peer);
 
   content::RequestPeer* original_peer_;
+  webkit_glue::ResourceLoaderBridge* resource_loader_bridge_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SecurityFilterPeer);
 };
 
 // The BufferedPeer reads all the data of the request into an internal buffer.
 // Subclasses should implement DataReady() to process the data as necessary.
 class BufferedPeer : public SecurityFilterPeer {
  public:
-  BufferedPeer(content::RequestPeer* peer, const std::string& mime_type);
+  BufferedPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
+               content::RequestPeer* peer,
+               const std::string& mime_type);
   virtual ~BufferedPeer();
 
   // content::RequestPeer Implementation.
   virtual void OnReceivedResponse(
       const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
   virtual void OnReceivedData(const char* data,
                               int data_length,
                               int encoded_data_length) OVERRIDE;
   virtual void OnCompletedRequest(
       int error_code,
@@ skipping 14 matching lines @@
   std::string data_;
 
  private:
   std::string mime_type_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferedPeer);
 };
 
 // The ReplaceContentPeer cancels the request and serves the provided data as
 // content instead.
-// TODO(jcampan): For now the resource is still being fetched, but ignored, as
-// once we have provided the replacement content, the associated pending request
+// 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
 // in ResourceDispatcher is removed and further OnReceived* notifications are
 // ignored.
 class ReplaceContentPeer : public SecurityFilterPeer {
  public:
-  ReplaceContentPeer(content::RequestPeer* peer,
+  ReplaceContentPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
+                     content::RequestPeer* peer,
                      const std::string& mime_type,
                      const std::string& data);
   virtual ~ReplaceContentPeer();
 
   // content::RequestPeer Implementation.
   virtual void OnReceivedResponse(
       const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
   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_;
   std::string mime_type_;
   std::string data_;
 
   DISALLOW_COPY_AND_ASSIGN(ReplaceContentPeer);
 };
 
 #endif  // CHROME_RENDERER_SECURITY_FILTER_PEER_H_