net: Remove typedef net::URLRequestJob URLRequestJob;

webkit/appcache/appcache_url_request_job.cc

 // Copyright (c) 2010 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"
 #include "base/stringprintf.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 
 namespace appcache {
 
 AppCacheURLRequestJob::AppCacheURLRequestJob(
     net::URLRequest* request, AppCacheStorage* storage)
-    : URLRequestJob(request), storage_(storage),
+    : net::URLRequestJob(request), storage_(storage),
       has_been_started_(false), has_been_killed_(false),
       delivery_type_(AWAITING_DELIVERY_ORDERS),
       cache_id_(kNoCacheId), is_fallback_(false),
       cache_entry_not_found_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(read_callback_(
           this, &AppCacheURLRequestJob::OnReadComplete)),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   DCHECK(storage_);
 }
 
@@ skipping 154 matching lines @@
   if (result == 0)
     NotifyDone(URLRequestStatus());
   else if (result < 0)
     NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, result));
   else
     SetStatus(URLRequestStatus());  // Clear the IO_PENDING status
 
   NotifyReadComplete(result);
 }
 
-// URLRequestJob overrides ------------------------------------------------
+// net::URLRequestJob overrides ------------------------------------------------
 
 void AppCacheURLRequestJob::Start() {
   DCHECK(!has_been_started());
   has_been_started_ = true;
   MaybeBeginDelivery();
 }
 
 void AppCacheURLRequestJob::Kill() {
   if (!has_been_killed_) {
     has_been_killed_ = true;
     reader_.reset();
     if (storage_) {
       storage_->CancelDelegateCallbacks(this);
       storage_ = NULL;
     }
-    URLRequestJob::Kill();
+    net::URLRequestJob::Kill();
     method_factory_.RevokeAll();
   }
 }
 
 net::LoadState AppCacheURLRequestJob::GetLoadState() const {
   if (!has_been_started())
     return net::LOAD_STATE_IDLE;
   if (!has_delivery_orders())
     return net::LOAD_STATE_WAITING_FOR_CACHE;
   if (delivery_type_ != APPCACHED_DELIVERY)
@@ skipping 49 matching lines @@
     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