net: Remove typedef net::URLRequestStatus URLRequestStatus;

webkit/blob/blob_url_request_job.cc

-// Copyright (c) 20010 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 "webkit/blob/blob_url_request_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/message_loop.h"
@@ skipping 318 matching lines @@
     }
   }
 
   // Start the asynchronous reading.
   int rv = stream_.Read(read_buf_->data() + read_buf_offset_,
                         bytes_to_read,
                         &io_callback_);
 
   // If I/O pending error is returned, we just need to wait.
   if (rv == net::ERR_IO_PENDING) {
-    SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
+    SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
     return false;
   }
 
   // For all other errors, bail out.
   if (rv < 0) {
     NotifyFailure(net::ERR_FAILED);
     return false;
   }
 
   // Otherwise, data is immediately available.
   AdvanceBytesRead(rv);
   return true;
 }
 
 void BlobURLRequestJob::DidRead(int result) {
   if (result < 0) {
     NotifyFailure(net::ERR_FAILED);
     return;
   }
-  SetStatus(URLRequestStatus());  // Clear the IO_PENDING status
+  SetStatus(net::URLRequestStatus());  // Clear the IO_PENDING status
 
   AdvanceBytesRead(result);
 
   // If the read buffer is completely filled, we're done.
   if (!read_buf_remaining_bytes_) {
     int bytes_read = ReadCompleted();
     NotifyReadComplete(bytes_read);
     return;
   }
 
@@ skipping 88 matching lines @@
   }
   HeadersCompleted(status_code, status_text);
 }
 
 void BlobURLRequestJob::NotifyFailure(int error_code) {
   error_ = true;
 
   // If we already return the headers on success, we can't change the headers
   // now. Instead, we just error out.
   if (headers_set_) {
-    NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, error_code));
+    NotifyDone(net::URLRequestStatus(net::URLRequestStatus::FAILED,
+                                     error_code));
     return;
   }
 
   int status_code = 0;
   std::string status_txt;
   switch (error_code) {
     case net::ERR_ACCESS_DENIED:
       status_code = kHTTPNotAllowed;
       status_txt = kHTTPNotAllowedText;
       break;
@@ skipping 55 matching lines @@
         // We don't support multiple range requests in one single URL request,
         // because we need to do multipart encoding here.
         // TODO(jianli): Support multipart byte range requests.
         NotifyFailure(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE);
       }
     }
   }
 }
 
 }  // namespace webkit_blob