summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/chrome_render_process_observer.cc8
-rw-r--r--chrome/renderer/extensions/extension_localization_peer.cc5
-rw-r--r--chrome/renderer/extensions/extension_localization_peer.h47
-rw-r--r--chrome/renderer/extensions/extension_localization_peer_unittest.cc3
-rw-r--r--chrome/renderer/security_filter_peer.cc13
-rw-r--r--chrome/renderer/security_filter_peer.h50
6 files changed, 64 insertions, 62 deletions
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index 450f1cd..1983712 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -65,8 +65,8 @@ class RendererResourceDelegate : public content::ResourceDispatcherDelegate {
: weak_factory_(this) {
}
- virtual webkit_glue::ResourceLoaderBridge::Peer* OnRequestComplete(
- webkit_glue::ResourceLoaderBridge::Peer* current_peer,
+ virtual content::RequestPeer* OnRequestComplete(
+ content::RequestPeer* current_peer,
ResourceType::Type resource_type,
int error_code) OVERRIDE {
// Update the browser about our cache.
@@ -88,8 +88,8 @@ class RendererResourceDelegate : public content::ResourceDispatcherDelegate {
resource_type, current_peer, error_code);
}
- virtual webkit_glue::ResourceLoaderBridge::Peer* OnReceivedResponse(
- webkit_glue::ResourceLoaderBridge::Peer* current_peer,
+ virtual content::RequestPeer* OnReceivedResponse(
+ content::RequestPeer* current_peer,
const std::string& mime_type,
const GURL& url) OVERRIDE {
return ExtensionLocalizationPeer::CreateExtensionLocalizationPeer(
diff --git a/chrome/renderer/extensions/extension_localization_peer.cc b/chrome/renderer/extensions/extension_localization_peer.cc
index 251bf80..84cb6a6 100644
--- a/chrome/renderer/extensions/extension_localization_peer.cc
+++ b/chrome/renderer/extensions/extension_localization_peer.cc
@@ -11,11 +11,12 @@
#include "extensions/common/constants.h"
#include "extensions/common/extension_messages.h"
#include "grit/generated_resources.h"
+#include "ipc/ipc_sender.h"
#include "net/base/net_errors.h"
#include "net/http/http_response_headers.h"
ExtensionLocalizationPeer::ExtensionLocalizationPeer(
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
IPC::Sender* message_sender,
const GURL& request_url)
: original_peer_(peer),
@@ -29,7 +30,7 @@ ExtensionLocalizationPeer::~ExtensionLocalizationPeer() {
// static
ExtensionLocalizationPeer*
ExtensionLocalizationPeer::CreateExtensionLocalizationPeer(
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
IPC::Sender* message_sender,
const std::string& mime_type,
const GURL& request_url) {
diff --git a/chrome/renderer/extensions/extension_localization_peer.h b/chrome/renderer/extensions/extension_localization_peer.h
index f4c71b6..43d4032 100644
--- a/chrome/renderer/extensions/extension_localization_peer.h
+++ b/chrome/renderer/extensions/extension_localization_peer.h
@@ -7,64 +7,63 @@
#include <string>
-#include "ipc/ipc_sender.h"
-#include "webkit/child/resource_loader_bridge.h"
+#include "content/public/child/request_peer.h"
#include "webkit/common/resource_response_info.h"
+namespace IPC {
+class Sender;
+}
+
// The ExtensionLocalizationPeer is a proxy to a
-// webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process
+// content::RequestPeer instance. It is used to pre-process
// CSS files requested by extensions to replace localization templates with the
// appropriate localized strings.
//
// Call the factory method CreateExtensionLocalizationPeer() to obtain an
// instance of ExtensionLocalizationPeer based on the original Peer.
-class ExtensionLocalizationPeer
- : public webkit_glue::ResourceLoaderBridge::Peer {
+class ExtensionLocalizationPeer : public content::RequestPeer {
public:
virtual ~ExtensionLocalizationPeer();
static ExtensionLocalizationPeer* CreateExtensionLocalizationPeer(
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
IPC::Sender* message_sender,
const std::string& mime_type,
const GURL& request_url);
- // ResourceLoaderBridge::Peer methods.
+ // content::RequestPeer methods.
virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
- virtual bool OnReceivedRedirect(
- const GURL& new_url,
- const webkit_glue::ResourceResponseInfo& info,
- bool* has_new_first_party_for_cookies,
- GURL* new_first_party_for_cookies) OVERRIDE;
+ virtual bool OnReceivedRedirect(const GURL& new_url,
+ const webkit_glue::ResourceResponseInfo& info,
+ bool* has_new_first_party_for_cookies,
+ GURL* new_first_party_for_cookies) OVERRIDE;
virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
virtual void OnDownloadedData(int len, int encoded_data_length) 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:
friend class ExtensionLocalizationPeerTest;
// Use CreateExtensionLocalizationPeer to create an instance.
- ExtensionLocalizationPeer(
- webkit_glue::ResourceLoaderBridge::Peer* peer,
- IPC::Sender* message_sender,
- const GURL& request_url);
+ ExtensionLocalizationPeer(content::RequestPeer* peer,
+ IPC::Sender* message_sender,
+ const GURL& request_url);
// Loads message catalogs, and replaces all __MSG_some_name__ templates within
// loaded file.
void ReplaceMessages();
// Original peer that handles the request once we are done processing data_.
- webkit_glue::ResourceLoaderBridge::Peer* original_peer_;
+ content::RequestPeer* original_peer_;
// We just pass though the response info. This holds the copy of the original.
webkit_glue::ResourceResponseInfo response_info_;
diff --git a/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/chrome/renderer/extensions/extension_localization_peer_unittest.cc
index 0eba97c..0ab36ba 100644
--- a/chrome/renderer/extensions/extension_localization_peer_unittest.cc
+++ b/chrome/renderer/extensions/extension_localization_peer_unittest.cc
@@ -50,8 +50,7 @@ class MockIpcMessageSender : public IPC::Sender {
DISALLOW_COPY_AND_ASSIGN(MockIpcMessageSender);
};
-class MockResourceLoaderBridgePeer
- : public webkit_glue::ResourceLoaderBridge::Peer {
+class MockResourceLoaderBridgePeer : public content::RequestPeer {
public:
MockResourceLoaderBridgePeer() {}
virtual ~MockResourceLoaderBridgePeer() {}
diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc
index 370fb66..5f795f8 100644
--- a/chrome/renderer/security_filter_peer.cc
+++ b/chrome/renderer/security_filter_peer.cc
@@ -13,7 +13,7 @@
SecurityFilterPeer::SecurityFilterPeer(
webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer)
+ content::RequestPeer* peer)
: original_peer_(peer),
resource_loader_bridge_(resource_loader_bridge) {
}
@@ -23,9 +23,9 @@ SecurityFilterPeer::~SecurityFilterPeer() {
// static
SecurityFilterPeer*
- SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(
+SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(
ResourceType::Type resource_type,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
int os_error) {
// Create a filter for SSL and CERT errors.
switch (os_error) {
@@ -55,7 +55,8 @@ SecurityFilterPeer*
// static
SecurityFilterPeer* SecurityFilterPeer::CreateSecurityFilterPeerForFrame(
- webkit_glue::ResourceLoaderBridge::Peer* peer, int os_error) {
+ content::RequestPeer* peer,
+ int os_error) {
// TODO(jcampan): use a different message when getting a phishing/malware
// error.
std::string html = base::StringPrintf(
@@ -134,7 +135,7 @@ void ProcessResponseInfo(
BufferedPeer::BufferedPeer(
webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
const std::string& mime_type)
: SecurityFilterPeer(resource_loader_bridge, peer),
mime_type_(mime_type) {
@@ -189,7 +190,7 @@ void BufferedPeer::OnCompletedRequest(int error_code,
ReplaceContentPeer::ReplaceContentPeer(
webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
const std::string& mime_type,
const std::string& data)
: SecurityFilterPeer(resource_loader_bridge, peer),
diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h
index 354cf62..ca98e18 100644
--- a/chrome/renderer/security_filter_peer.h
+++ b/chrome/renderer/security_filter_peer.h
@@ -5,56 +5,58 @@
#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/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
-// webkit_glue::ResourceLoaderBridge::Peer instance. It is used to pre-process
+// 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 webkit_glue::ResourceLoaderBridge::Peer {
+class SecurityFilterPeer : public content::RequestPeer {
public:
virtual ~SecurityFilterPeer();
static SecurityFilterPeer* CreateSecurityFilterPeerForDeniedRequest(
ResourceType::Type resource_type,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
int os_error);
static SecurityFilterPeer* CreateSecurityFilterPeerForFrame(
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
int os_error);
- // ResourceLoaderBridge::Peer methods.
+ // content::RequestPeer methods.
virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
- virtual bool OnReceivedRedirect(
- const GURL& new_url,
- const webkit_glue::ResourceResponseInfo& info,
- bool* has_new_first_party_for_cookies,
- GURL* new_first_party_for_cookies) OVERRIDE;
+ virtual bool OnReceivedRedirect(const GURL& new_url,
+ const webkit_glue::ResourceResponseInfo& info,
+ bool* has_new_first_party_for_cookies,
+ GURL* new_first_party_for_cookies) OVERRIDE;
virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
virtual void OnDownloadedData(int len, int encoded_data_length) 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;
protected:
SecurityFilterPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer);
+ content::RequestPeer* peer);
- webkit_glue::ResourceLoaderBridge::Peer* original_peer_;
+ content::RequestPeer* original_peer_;
webkit_glue::ResourceLoaderBridge* resource_loader_bridge_;
private:
@@ -66,11 +68,11 @@ class SecurityFilterPeer : public webkit_glue::ResourceLoaderBridge::Peer {
class BufferedPeer : public SecurityFilterPeer {
public:
BufferedPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
const std::string& mime_type);
virtual ~BufferedPeer();
- // ResourceLoaderBridge::Peer Implementation.
+ // content::RequestPeer Implementation.
virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
virtual void OnReceivedData(const char* data,
@@ -111,12 +113,12 @@ class BufferedPeer : public SecurityFilterPeer {
class ReplaceContentPeer : public SecurityFilterPeer {
public:
ReplaceContentPeer(webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
- webkit_glue::ResourceLoaderBridge::Peer* peer,
+ content::RequestPeer* peer,
const std::string& mime_type,
const std::string& data);
virtual ~ReplaceContentPeer();
- // ResourceLoaderBridge::Peer Implementation.
+ // content::RequestPeer Implementation.
virtual void OnReceivedResponse(
const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
virtual void OnReceivedData(const char* data,