| Index: content/browser/renderer_host/resource_loader.cc
|
| diff --git a/content/browser/renderer_host/resource_loader.cc b/content/browser/renderer_host/resource_loader.cc
|
| index be923ca81f9f7dae88c38ee5ac58a5a459ee38e7..ada06e44c3c352f79c3be630a2f4d8e6685c0ccb 100644
|
| --- a/content/browser/renderer_host/resource_loader.cc
|
| +++ b/content/browser/renderer_host/resource_loader.cc
|
| @@ -28,7 +28,7 @@ namespace {
|
|
|
| void PopulateResourceResponse(net::URLRequest* request,
|
| ResourceResponse* response) {
|
| - response->head.status = request->status();
|
| + response->head.error_code = request->status().error();
|
| response->head.request_time = request->request_time();
|
| response->head.response_time = request->response_time();
|
| response->head.headers = request->response_headers();
|
| @@ -82,7 +82,7 @@ ResourceLoader::~ResourceLoader() {
|
|
|
| void ResourceLoader::StartRequest() {
|
| if (delegate_->HandleExternalProtocol(this, request_->url())) {
|
| - CancelRequestInternal(net::ERR_UNKNOWN_URL_SCHEME, false);
|
| + CancelRequestInternal(net::OK_HANDLED_EXTERNALLY, false);
|
| return;
|
| }
|
|
|
| @@ -105,6 +105,10 @@ void ResourceLoader::CancelRequest(bool from_renderer) {
|
| CancelRequestInternal(net::ERR_ABORTED, from_renderer);
|
| }
|
|
|
| +void ResourceLoader::CancelWithError(int error) {
|
| + CancelRequestInternal(error, false);
|
| +}
|
| +
|
| void ResourceLoader::ReportUploadProgress() {
|
| ResourceRequestInfoImpl* info = GetRequestInfo();
|
|
|
| @@ -203,7 +207,7 @@ void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused,
|
|
|
| if (delegate_->HandleExternalProtocol(this, new_url)) {
|
| // The request is complete so we can remove it.
|
| - CancelRequestInternal(net::ERR_UNKNOWN_URL_SCHEME, false);
|
| + CancelRequestInternal(net::OK_HANDLED_EXTERNALLY, false);
|
| return;
|
| }
|
|
|
|
|