net: Remove typedef net::URLRequestJob URLRequestJob;

chrome/browser/automation/url_request_automation_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 "chrome/browser/automation/url_request_automation_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
@@ skipping 33 matching lines @@
     = NULL;
 net::URLRequest::ProtocolFactory* URLRequestAutomationJob::old_https_factory_
     = NULL;
 
 URLRequestAutomationJob::URLRequestAutomationJob(
     net::URLRequest* request,
     int tab,
     int request_id,
     AutomationResourceMessageFilter* filter,
     bool is_pending)
-    : URLRequestJob(request),
+    : net::URLRequestJob(request),
       id_(0),
       tab_(tab),
       message_filter_(filter),
       pending_buf_size_(0),
       redirect_status_(0),
       request_id_(request_id),
       is_pending_(is_pending),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   DVLOG(1) << "URLRequestAutomationJob create. Count: " << ++instance_count_;
   DCHECK(message_filter_ != NULL);
@@ skipping 18 matching lines @@
             "http", &URLRequestAutomationJob::Factory);
     old_https_factory_ =
         net::URLRequest::RegisterProtocolFactory(
             "https", &URLRequestAutomationJob::Factory);
     is_protocol_factory_registered_ = true;
   }
 
   return true;
 }
 
-URLRequestJob* URLRequestAutomationJob::Factory(net::URLRequest* request,
-                                                const std::string& scheme) {
+net::URLRequestJob* URLRequestAutomationJob::Factory(
+    net::URLRequest* request,
+    const std::string& scheme) {
   bool scheme_is_http = request->url().SchemeIs("http");
   bool scheme_is_https = request->url().SchemeIs("https");
 
   // Returning null here just means that the built-in handler will be used.
   if (scheme_is_http || scheme_is_https) {
     ResourceDispatcherHostRequestInfo* request_info = NULL;
     if (request->GetUserData(NULL))
       request_info = ResourceDispatcherHost::InfoForRequest(request);
     if (request_info) {
       int child_id = request_info->child_id();
@@ skipping 15 matching lines @@
     }
 
     if (scheme_is_http && old_http_factory_)
       return old_http_factory_(request, scheme);
     else if (scheme_is_https && old_https_factory_)
       return old_https_factory_(request, scheme);
   }
   return NULL;
 }
 
-// URLRequestJob Implementation.
+// net::URLRequestJob Implementation.
 void URLRequestAutomationJob::Start() {
   if (!is_pending()) {
     // Start reading asynchronously so that all error reporting and data
     // callbacks happen as they would for network requests.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         method_factory_.NewRunnableMethod(
             &URLRequestAutomationJob::StartAsync));
   } else {
     // If this is a pending job, then register it immediately with the message
     // filter so it can be serviced later when we receive a request from the
     // external host to connect to the corresponding external tab.
     message_filter_->RegisterRequest(this);
   }
 }
 
 void URLRequestAutomationJob::Kill() {
   if (message_filter_.get()) {
     if (!is_pending()) {
       message_filter_->Send(new AutomationMsg_RequestEnd(0, tab_, id_,
           URLRequestStatus(URLRequestStatus::CANCELED, net::ERR_ABORTED)));
     }
   }
   DisconnectFromMessageFilter();
-  URLRequestJob::Kill();
+  net::URLRequestJob::Kill();
 }
 
 bool URLRequestAutomationJob::ReadRawData(
     net::IOBuffer* buf, int buf_size, int* bytes_read) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DVLOG(1) << "URLRequestAutomationJob: " << request_->url().spec()
            << " - read pending: " << buf_size;
 
   // We should not receive a read request for a pending job.
   DCHECK(!is_pending());
@@ skipping 306 matching lines @@
   if (!is_done()) {
     NotifyDone(request_status_);
   }
   // Reset any pending reads.
   if (pending_buf_) {
     pending_buf_ = NULL;
     pending_buf_size_ = 0;
     NotifyReadComplete(0);
   }
 }