| Index: chrome/common/security_filter_peer.cc
|
| diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc
|
| index 3be8864ad7f8c21f21204e188f8e9b9b8f990851..37db9a77687149c07d731df7b7bd94f2ffc51561 100644
|
| --- a/chrome/common/security_filter_peer.cc
|
| +++ b/chrome/common/security_filter_peer.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.
|
|
|
| @@ -84,7 +84,7 @@ void SecurityFilterPeer::OnReceivedData(const char* data, int len) {
|
| NOTREACHED();
|
| }
|
|
|
| -void SecurityFilterPeer::OnCompletedRequest(const URLRequestStatus& status,
|
| +void SecurityFilterPeer::OnCompletedRequest(const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| const base::Time& completion_time) {
|
| NOTREACHED();
|
| @@ -143,17 +143,18 @@ void BufferedPeer::OnReceivedData(const char* data, int len) {
|
| data_.append(data, len);
|
| }
|
|
|
| -void BufferedPeer::OnCompletedRequest(const URLRequestStatus& status,
|
| +void BufferedPeer::OnCompletedRequest(const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| const base::Time& completion_time) {
|
| // Make sure we delete ourselves at the end of this call.
|
| scoped_ptr<BufferedPeer> this_deleter(this);
|
|
|
| // Give sub-classes a chance at altering the data.
|
| - if (status.status() != URLRequestStatus::SUCCESS || !DataReady()) {
|
| + if (status.status() != net::URLRequestStatus::SUCCESS || !DataReady()) {
|
| // Pretend we failed to load the resource.
|
| original_peer_->OnReceivedResponse(response_info_, true);
|
| - URLRequestStatus status(URLRequestStatus::CANCELED, net::ERR_ABORTED);
|
| + net::URLRequestStatus status(net::URLRequestStatus::CANCELED,
|
| + net::ERR_ABORTED);
|
| original_peer_->OnCompletedRequest(status, security_info, completion_time);
|
| return;
|
| }
|
| @@ -192,7 +193,7 @@ void ReplaceContentPeer::OnReceivedData(const char* data, int len) {
|
| }
|
|
|
| void ReplaceContentPeer::OnCompletedRequest(
|
| - const URLRequestStatus& status,
|
| + const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| const base::Time& completion_time) {
|
| webkit_glue::ResourceResponseInfo info;
|
| @@ -203,7 +204,7 @@ void ReplaceContentPeer::OnCompletedRequest(
|
| if (!data_.empty())
|
| original_peer_->OnReceivedData(data_.data(),
|
| static_cast<int>(data_.size()));
|
| - original_peer_->OnCompletedRequest(URLRequestStatus(),
|
| + original_peer_->OnCompletedRequest(net::URLRequestStatus(),
|
| security_info,
|
| completion_time);
|
|
|
|
|