diff options
Diffstat (limited to 'chrome/renderer')
5 files changed, 8 insertions, 12 deletions
diff --git a/chrome/renderer/extensions/extension_localization_peer.cc b/chrome/renderer/extensions/extension_localization_peer.cc index ec93caf..8c20331 100644 --- a/chrome/renderer/extensions/extension_localization_peer.cc +++ b/chrome/renderer/extensions/extension_localization_peer.cc @@ -46,8 +46,7 @@ void ExtensionLocalizationPeer::OnUploadProgress( } bool ExtensionLocalizationPeer::OnReceivedRedirect( - const GURL& new_url, - const GURL& new_first_party_for_cookies, + const net::RedirectInfo& redirect_info, const content::ResourceResponseInfo& info) { NOTREACHED(); return false; diff --git a/chrome/renderer/extensions/extension_localization_peer.h b/chrome/renderer/extensions/extension_localization_peer.h index 4d6c056..95127cd 100644 --- a/chrome/renderer/extensions/extension_localization_peer.h +++ b/chrome/renderer/extensions/extension_localization_peer.h @@ -34,8 +34,7 @@ class ExtensionLocalizationPeer : public content::RequestPeer { // content::RequestPeer methods. virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE; virtual bool OnReceivedRedirect( - const GURL& new_url, - const GURL& new_first_party_for_cookies, + const net::RedirectInfo& redirect_info, const content::ResourceResponseInfo& info) OVERRIDE; virtual void OnReceivedResponse( const content::ResourceResponseInfo& info) OVERRIDE; diff --git a/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/chrome/renderer/extensions/extension_localization_peer_unittest.cc index 750405b..38ad056 100644 --- a/chrome/renderer/extensions/extension_localization_peer_unittest.cc +++ b/chrome/renderer/extensions/extension_localization_peer_unittest.cc @@ -11,6 +11,7 @@ #include "ipc/ipc_sender.h" #include "ipc/ipc_sync_message.h" #include "net/base/net_errors.h" +#include "net/url_request/redirect_info.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -55,9 +56,8 @@ class MockRequestPeer : public content::RequestPeer { virtual ~MockRequestPeer() {} MOCK_METHOD2(OnUploadProgress, void(uint64 position, uint64 size)); - MOCK_METHOD3(OnReceivedRedirect, - bool(const GURL& new_url, - const GURL& new_first_party_for_cookies, + MOCK_METHOD2(OnReceivedRedirect, + bool(const net::RedirectInfo& redirect_info, const content::ResourceResponseInfo& info)); MOCK_METHOD1(OnReceivedResponse, void(const content::ResourceResponseInfo& info)); diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc index ce8c5bc..e43e7ec 100644 --- a/chrome/renderer/security_filter_peer.cc +++ b/chrome/renderer/security_filter_peer.cc @@ -69,8 +69,7 @@ void SecurityFilterPeer::OnUploadProgress(uint64 position, uint64 size) { } bool SecurityFilterPeer::OnReceivedRedirect( - const GURL& new_url, - const GURL& new_first_party_for_cookies, + const net::RedirectInfo& redirect_info, const content::ResourceResponseInfo& info) { NOTREACHED(); return false; diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h index 8fa57497..792fba4 100644 --- a/chrome/renderer/security_filter_peer.h +++ b/chrome/renderer/security_filter_peer.h @@ -14,7 +14,7 @@ // 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 +// NOTE: subclasses should ensure they delete themselves at the end of the // OnReceiveComplete call. class SecurityFilterPeer : public content::RequestPeer { public: @@ -32,8 +32,7 @@ class SecurityFilterPeer : public content::RequestPeer { // content::RequestPeer methods. virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE; virtual bool OnReceivedRedirect( - const GURL& new_url, - const GURL& new_first_party_for_cookies, + const net::RedirectInfo& redirect_info, const content::ResourceResponseInfo& info) OVERRIDE; virtual void OnReceivedResponse( const content::ResourceResponseInfo& info) OVERRIDE; |