| Index: chrome/renderer/security_filter_peer.cc
|
| diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc
|
| index 370fb66d7a2c445fde55a9e60d3029768c319604..6941305f08a8c2838468b948372905acd121e956 100644
|
| --- a/chrome/renderer/security_filter_peer.cc
|
| +++ b/chrome/renderer/security_filter_peer.cc
|
| @@ -12,20 +12,18 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| SecurityFilterPeer::SecurityFilterPeer(
|
| - webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer)
|
| - : original_peer_(peer),
|
| - resource_loader_bridge_(resource_loader_bridge) {
|
| -}
|
| + content::ResourceLoaderBridge* resource_loader_bridge,
|
| + content::ResourceLoaderBridge::Peer* peer)
|
| + : original_peer_(peer), resource_loader_bridge_(resource_loader_bridge) {}
|
|
|
| SecurityFilterPeer::~SecurityFilterPeer() {
|
| }
|
|
|
| // static
|
| SecurityFilterPeer*
|
| - SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(
|
| +SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(
|
| ResourceType::Type resource_type,
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer,
|
| + content::ResourceLoaderBridge::Peer* peer,
|
| int os_error) {
|
| // Create a filter for SSL and CERT errors.
|
| switch (os_error) {
|
| @@ -55,7 +53,8 @@ SecurityFilterPeer*
|
|
|
| // static
|
| SecurityFilterPeer* SecurityFilterPeer::CreateSecurityFilterPeerForFrame(
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer, int os_error) {
|
| + content::ResourceLoaderBridge::Peer* peer,
|
| + int os_error) {
|
| // TODO(jcampan): use a different message when getting a phishing/malware
|
| // error.
|
| std::string html = base::StringPrintf(
|
| @@ -133,12 +132,10 @@ void ProcessResponseInfo(
|
| // BufferedPeer
|
|
|
| BufferedPeer::BufferedPeer(
|
| - webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer,
|
| + content::ResourceLoaderBridge* resource_loader_bridge,
|
| + content::ResourceLoaderBridge::Peer* peer,
|
| const std::string& mime_type)
|
| - : SecurityFilterPeer(resource_loader_bridge, peer),
|
| - mime_type_(mime_type) {
|
| -}
|
| + : SecurityFilterPeer(resource_loader_bridge, peer), mime_type_(mime_type) {}
|
|
|
| BufferedPeer::~BufferedPeer() {
|
| }
|
| @@ -188,14 +185,13 @@ void BufferedPeer::OnCompletedRequest(int error_code,
|
| // ReplaceContentPeer
|
|
|
| ReplaceContentPeer::ReplaceContentPeer(
|
| - webkit_glue::ResourceLoaderBridge* resource_loader_bridge,
|
| - webkit_glue::ResourceLoaderBridge::Peer* peer,
|
| + content::ResourceLoaderBridge* resource_loader_bridge,
|
| + content::ResourceLoaderBridge::Peer* peer,
|
| const std::string& mime_type,
|
| const std::string& data)
|
| : SecurityFilterPeer(resource_loader_bridge, peer),
|
| mime_type_(mime_type),
|
| - data_(data) {
|
| -}
|
| + data_(data) {}
|
|
|
| ReplaceContentPeer::~ReplaceContentPeer() {
|
| }
|
|
|