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

3 files changed, 12 insertions, 12 deletions

diff --git a/webkit/appcache/appcache_request_handler.cc b/webkit/appcache/appcache_request_handler.cc
index 72e6beb..a514517 100644
--- a/webkit/appcache/appcache_request_handler.cc
+++ b/webkit/appcache/appcache_request_handler.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.
 
@@ -121,8 +121,8 @@ AppCacheURLRequestJob* AppCacheRequestHandler::MaybeLoadFallbackForResponse(
   if (!found_fallback_entry_.has_response_id())
     return NULL;
 
-  if (request->status().status() == URLRequestStatus::CANCELED ||
-      request->status().status() == URLRequestStatus::HANDLED_EXTERNALLY) {
+  if (request->status().status() == net::URLRequestStatus::CANCELED ||
+      request->status().status() == net::URLRequestStatus::HANDLED_EXTERNALLY) {
     // 6.9.6, step 4: But not if the user canceled the download.
     return NULL;
   }
diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/appcache/appcache_url_request_job.cc
index 10245f7..205458f 100644
--- a/webkit/appcache/appcache_url_request_job.cc
+++ b/webkit/appcache/appcache_url_request_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.
 
@@ -94,8 +94,8 @@ void AppCacheURLRequestJob::BeginDelivery() {
     case ERROR_DELIVERY:
       request()->net_log().AddEvent(
           net::NetLog::TYPE_APPCACHE_DELIVERING_ERROR_RESPONSE, NULL);
-      NotifyStartError(
-          URLRequestStatus(URLRequestStatus::FAILED, net::ERR_FAILED));
+      NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
+                                             net::ERR_FAILED));
       break;
 
     case APPCACHED_DELIVERY:
@@ -188,11 +188,11 @@ void AppCacheURLRequestJob::SetupRangeResponse() {
 void AppCacheURLRequestJob::OnReadComplete(int result) {
   DCHECK(is_delivering_appcache_response());
   if (result == 0)
-    NotifyDone(URLRequestStatus());
+    NotifyDone(net::URLRequestStatus());
   else if (result < 0)
-    NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, result));
+    NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED, result));
   else
-    SetStatus(URLRequestStatus());  // Clear the IO_PENDING status
+    SetStatus(net::URLRequestStatus());  // Clear the IO_PENDING status
 
   NotifyReadComplete(result);
 }
@@ -267,7 +267,7 @@ bool AppCacheURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size,
   DCHECK(bytes_read);
   DCHECK(!reader_->IsReadPending());
   reader_->ReadData(buf, buf_size, &read_callback_);
-  SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
+  SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
   return false;
 }
 
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index a83fd10b..e1772c3 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.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.
 
@@ -711,7 +711,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
   }
 
   void VerifyCancel() {
-    EXPECT_EQ(URLRequestStatus::CANCELED,
+    EXPECT_EQ(net::URLRequestStatus::CANCELED,
               request_->status().status());
     TestFinished();
   }