net: Remove typedef net::URLRequestStatus URLRequestStatus;

webkit/appcache/appcache_url_request_job.cc

-// 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.
 
 #include <vector>
 
 #include "webkit/appcache/appcache_url_request_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 75 matching lines @@
       // To fallthru to the network, we restart the request which will
       // cause a new job to be created to retrieve the resource from the
       // network. Our caller is responsible for arranging to not re-intercept
       // the same request.
       NotifyRestartRequired();
       break;
 
     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:
       request()->net_log().AddEvent(
           is_fallback_ ?
               net::NetLog::TYPE_APPCACHE_DELIVERING_FALLBACK_RESPONSE :
               net::NetLog::TYPE_APPCACHE_DELIVERING_CACHED_RESPONSE,
           NULL);
       storage_->LoadResponseInfo(manifest_url_, entry_.response_id(), this);
       break;
@@ skipping 72 matching lines @@
       base::StringPrintf("%s: bytes %d-%d/%d",
                          kRangeHeader,
                          offset,
                          offset + length - 1,
                          resource_size));
 }
 
 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);
 }
 
 // net::URLRequestJob overrides ------------------------------------------------
 
 void AppCacheURLRequestJob::Start() {
   DCHECK(!has_been_started());
   has_been_started_ = true;
   MaybeBeginDelivery();
@@ skipping 54 matching lines @@
   return is_delivering_appcache_response();
 }
 
 bool AppCacheURLRequestJob::ReadRawData(net::IOBuffer* buf, int buf_size,
                                         int *bytes_read) {
   DCHECK(is_delivering_appcache_response());
   DCHECK_NE(buf_size, 0);
   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;
 }
 
 void AppCacheURLRequestJob::SetExtraRequestHeaders(
     const net::HttpRequestHeaders& headers) {
   std::string value;
   std::vector<net::HttpByteRange> ranges;
   if (!headers.GetHeader(net::HttpRequestHeaders::kRange, &value) ||
       !net::HttpUtil::ParseRangeHeader(value, &ranges)) {
     return;
   }
 
   // If multiple ranges are requested, we play dumb and
   // return the entire response with 200 OK.
   if (ranges.size() == 1U)
     range_requested_ = ranges[0];
 }
 
 }  // namespace appcache