summaryrefslogtreecommitdiffstats
path: root/chrome/common/net/url_request_intercept_job.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 02:12:44 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-13 02:12:44 +0000
commitf90bf0d9264f7f272b7f4a65f864cb7170417fe8 (patch)
tree3df23eb7b118bfd40c7601df6245d869b56ced49 /chrome/common/net/url_request_intercept_job.cc
parent56d8cf25ee047078688c8af5917fcfbc63ac749b (diff)
downloadchromium_src-f90bf0d9264f7f272b7f4a65f864cb7170417fe8.zip
chromium_src-f90bf0d9264f7f272b7f4a65f864cb7170417fe8.tar.gz
chromium_src-f90bf0d9264f7f272b7f4a65f864cb7170417fe8.tar.bz2
net: Remove typedef net::URLRequestStatus URLRequestStatus;
BUG=64263 TEST=compiled locally, trybots Review URL: http://codereview.chromium.org/6166010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/net/url_request_intercept_job.cc')
-rw-r--r--chrome/common/net/url_request_intercept_job.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc
index 641a8e8..89b0c55 100644
--- a/chrome/common/net/url_request_intercept_job.cc
+++ b/chrome/common/net/url_request_intercept_job.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.
//
@@ -91,10 +91,11 @@ bool URLRequestInterceptJob::ReadRawData(net::IOBuffer* dest, int dest_size,
if (rv == CPERR_IO_PENDING) {
read_buffer_ = dest;
read_buffer_size_ = dest_size;
- SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
+ SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
} else {
// TODO(mpcomplete): better error code
- NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, net::ERR_FAILED));
+ NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED,
+ net::ERR_FAILED));
}
return false;
@@ -208,8 +209,8 @@ void URLRequestInterceptJob::StartAsync() {
void URLRequestInterceptJob::OnStartCompleted(int result) {
if (result != CPERR_SUCCESS) {
- NotifyDone(URLRequestStatus(URLRequestStatus::FAILED,
- net::ERR_CONNECTION_FAILED));
+ NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED,
+ net::ERR_CONNECTION_FAILED));
return;
}
@@ -218,11 +219,12 @@ void URLRequestInterceptJob::OnStartCompleted(int result) {
void URLRequestInterceptJob::OnReadCompleted(int bytes_read) {
if (bytes_read < 0) {
- NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, net::ERR_FAILED));
+ NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED,
+ net::ERR_FAILED));
return;
}
- SetStatus(URLRequestStatus()); // clear the async flag
+ SetStatus(net::URLRequestStatus()); // clear the async flag
NotifyReadComplete(bytes_read);
}