| Index: chrome/common/resource_dispatcher.cc
|
| diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
|
| index e4747b9848d9ba645c0cb6d5202c2f4a2fb5f551..0fd53c5be25551bcda7e00ba19b9855fa390f879 100644
|
| --- a/chrome/common/resource_dispatcher.cc
|
| +++ b/chrome/common/resource_dispatcher.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.
|
|
|
| @@ -213,7 +213,7 @@ void IPCResourceLoaderBridge::SetDefersLoading(bool value) {
|
| void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) {
|
| if (request_id_ != -1) {
|
| NOTREACHED() << "Starting a request twice";
|
| - response->status.set_status(URLRequestStatus::FAILED);
|
| + response->status.set_status(net::URLRequestStatus::FAILED);
|
| return;
|
| }
|
|
|
| @@ -224,7 +224,7 @@ 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(URLRequestStatus::FAILED);
|
| + response->status.set_status(net::URLRequestStatus::FAILED);
|
| return;
|
| }
|
|
|
| @@ -423,7 +423,7 @@ void ResourceDispatcher::FollowPendingRedirect(
|
| }
|
|
|
| void ResourceDispatcher::OnRequestComplete(int request_id,
|
| - const URLRequestStatus& status,
|
| + const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| const base::Time& completion_time) {
|
| PendingRequestInfo* request_info = GetPendingRequestInfo(request_id);
|
| @@ -432,7 +432,7 @@ void ResourceDispatcher::OnRequestComplete(int request_id,
|
|
|
| webkit_glue::ResourceLoaderBridge::Peer* peer = request_info->peer;
|
|
|
| - if (status.status() == URLRequestStatus::CANCELED &&
|
| + if (status.status() == net::URLRequestStatus::CANCELED &&
|
| status.os_error() != net::ERR_ABORTED) {
|
| // Resource canceled with a specific error are filtered.
|
| SecurityFilterPeer* new_peer =
|
|
|