| Index: content/common/resource_dispatcher.cc
|
| diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc
|
| index cbc98c5dffd494fee29a9572313dc1f95ccd6ae5..b833250445bc0f24af2dea820e04d963e8d117e7 100644
|
| --- a/content/common/resource_dispatcher.cc
|
| +++ b/content/common/resource_dispatcher.cc
|
| @@ -225,7 +225,7 @@ void IPCResourceLoaderBridge::SetDefersLoading(bool value) {
|
| void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) {
|
| if (request_id_ != -1) {
|
| NOTREACHED() << "Starting a request twice";
|
| - response->status.set_status(net::URLRequestStatus::FAILED);
|
| + response->error_code = net::ERR_FAILED;
|
| return;
|
| }
|
|
|
| @@ -237,11 +237,11 @@ void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) {
|
| request_, &result);
|
| // NOTE: This may pump events (see RenderThread::Send).
|
| if (!dispatcher_->message_sender()->Send(msg)) {
|
| - response->status.set_status(net::URLRequestStatus::FAILED);
|
| + response->error_code = net::ERR_FAILED;
|
| return;
|
| }
|
|
|
| - response->status = result.status;
|
| + response->error_code = result.error_code;
|
| response->url = result.final_url;
|
| response->headers = result.headers;
|
| response->mime_type = result.mime_type;
|
| @@ -446,7 +446,8 @@ void ResourceDispatcher::FollowPendingRedirect(
|
|
|
| void ResourceDispatcher::OnRequestComplete(
|
| int request_id,
|
| - const net::URLRequestStatus& status,
|
| + int error_code,
|
| + bool is_handled_externally,
|
| const std::string& security_info,
|
| const base::TimeTicks& browser_completion_time) {
|
| PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
|
| @@ -459,7 +460,7 @@ void ResourceDispatcher::OnRequestComplete(
|
| if (delegate_) {
|
| ResourceLoaderBridge::Peer* new_peer =
|
| delegate_->OnRequestComplete(
|
| - request_info->peer, request_info->resource_type, status);
|
| + request_info->peer, request_info->resource_type, error_code);
|
| if (new_peer)
|
| request_info->peer = new_peer;
|
| }
|
| @@ -469,7 +470,8 @@ void ResourceDispatcher::OnRequestComplete(
|
| // The request ID will be removed from our pending list in the destructor.
|
| // Normally, dispatching this message causes the reference-counted request to
|
| // die immediately.
|
| - peer->OnCompletedRequest(status, security_info, renderer_completion_time);
|
| + peer->OnCompletedRequest(error_code, is_handled_externally, security_info,
|
| + renderer_completion_time);
|
| }
|
|
|
| int ResourceDispatcher::AddPendingRequest(
|
|
|