| Index: content/browser/renderer_host/buffered_resource_handler.cc
|
| diff --git a/content/browser/renderer_host/buffered_resource_handler.cc b/content/browser/renderer_host/buffered_resource_handler.cc
|
| index 6f0f2f74a02d7506683bc956687dc7c53d3883ed..dbb1942161fd22d94c44969d2af08ea547130495 100644
|
| --- a/content/browser/renderer_host/buffered_resource_handler.cc
|
| +++ b/content/browser/renderer_host/buffered_resource_handler.cc
|
| @@ -15,6 +15,7 @@
|
| #include "content/browser/plugin_service_impl.h"
|
| #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
|
| #include "content/browser/renderer_host/resource_request_info_impl.h"
|
| +#include "content/browser/renderer_host/resource_request_info_impl.h"
|
| #include "content/browser/renderer_host/x509_user_cert_resource_handler.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| @@ -211,6 +212,10 @@ void BufferedResourceHandler::Cancel() {
|
| controller()->Cancel();
|
| }
|
|
|
| +void BufferedResourceHandler::CancelAndIgnore() {
|
| + controller()->CancelAndIgnore();
|
| +}
|
| +
|
| bool BufferedResourceHandler::ProcessResponse(bool* defer) {
|
| DCHECK_EQ(STATE_PROCESSING, state_);
|
|
|
| @@ -351,7 +356,11 @@ bool BufferedResourceHandler::UseAlternateNextHandler(
|
| bool defer_ignored = false;
|
| next_handler_->OnResponseStarted(request_id, response_, &defer_ignored);
|
| DCHECK(!defer_ignored);
|
| - net::URLRequestStatus status(net::URLRequestStatus::HANDLED_EXTERNALLY, 0);
|
| + net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
|
| + net::ERR_ABORTED);
|
| + ResourceRequestInfoImpl* info =
|
| + ResourceRequestInfoImpl::ForRequest(request_);
|
| + info->set_was_ignored_by_handler(true);
|
| next_handler_->OnResponseCompleted(request_id, status, std::string());
|
|
|
| // This is handled entirely within the new ResourceHandler, so just reset the
|
|
|