| Index: chrome/browser/renderer_host/resource_dispatcher_host.cc
|
| diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
|
| index 14489dea79ea78bdccf250d9930597bad98283aa..803604feb036b229775c0e5d8456103b8525922b 100644
|
| --- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
|
| +++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -303,10 +303,10 @@ bool ResourceDispatcherHost::HandleExternalProtocol(int request_id,
|
| NewRunnableFunction(
|
| &ExternalProtocolHandler::LaunchUrl, url, child_id, route_id));
|
|
|
| - handler->OnResponseCompleted(request_id, URLRequestStatus(
|
| - URLRequestStatus::FAILED,
|
| - net::ERR_ABORTED),
|
| - std::string()); // No security info necessary.
|
| + handler->OnResponseCompleted(
|
| + request_id,
|
| + net::URLRequestStatus(net::URLRequestStatus::FAILED, net::ERR_ABORTED),
|
| + std::string()); // No security info necessary.
|
| return true;
|
| }
|
|
|
| @@ -377,7 +377,8 @@ void ResourceDispatcherHost::BeginRequest(
|
|
|
| if (is_shutdown_ ||
|
| !ShouldServiceRequest(process_type, child_id, request_data)) {
|
| - URLRequestStatus status(URLRequestStatus::FAILED, net::ERR_ABORTED);
|
| + net::URLRequestStatus status(net::URLRequestStatus::FAILED,
|
| + net::ERR_ABORTED);
|
| if (sync_result) {
|
| SyncLoadResult result;
|
| result.status = status;
|
|
|