net: Remove typedef net::URLRequestJob URLRequestJob;

BUG=64263
TEST=compiled locally, trybots

Review URL: http://codereview.chromium.org/5607004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68935 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 29 insertions, 28 deletions

diff --git a/webkit/appcache/appcache_interceptor.cc b/webkit/appcache/appcache_interceptor.cc
index 3f61e71..969b513 100644
--- a/webkit/appcache/appcache_interceptor.cc
+++ b/webkit/appcache/appcache_interceptor.cc
@@ -65,14 +65,15 @@ AppCacheInterceptor::~AppCacheInterceptor() {
   net::URLRequest::UnregisterRequestInterceptor(this);
 }
 
-URLRequestJob* AppCacheInterceptor::MaybeIntercept(net::URLRequest* request) {
+net::URLRequestJob* AppCacheInterceptor::MaybeIntercept(
+    net::URLRequest* request) {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
   return handler->MaybeLoadResource(request);
 }
 
-URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
+net::URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
     net::URLRequest* request,
     const GURL& location) {
   AppCacheRequestHandler* handler = GetHandler(request);
@@ -81,7 +82,7 @@ URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
   return handler->MaybeLoadFallbackForRedirect(request, location);
 }
 
-URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
+net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
     net::URLRequest* request) {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc
index 3556d51..6f69ae9 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/appcache/appcache_request_handler_unittest.cc
@@ -71,10 +71,10 @@ class AppCacheRequestHandlerTest : public testing::Test {
   // Subclasses to simulate particular response codes so test cases can
   // exercise fallback code paths.
 
-  class MockURLRequestJob : public URLRequestJob {
+  class MockURLRequestJob : public net::URLRequestJob {
    public:
     MockURLRequestJob(net::URLRequest* request, int response_code)
-        : URLRequestJob(request), response_code_(response_code) {}
+        : net::URLRequestJob(request), response_code_(response_code) {}
     virtual void Start() {}
     virtual int GetResponseCode() const { return response_code_; }
     int response_code_;
@@ -94,10 +94,10 @@ class AppCacheRequestHandlerTest : public testing::Test {
     }
   };
 
-  static URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
-                                           const std::string& scheme) {
+  static net::URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
+                                                const std::string& scheme) {
     if (mock_factory_job_) {
-      URLRequestJob* temp = mock_factory_job_;
+      net::URLRequestJob* temp = mock_factory_job_;
       mock_factory_job_ = NULL;
       return temp;
     } else {
@@ -668,12 +668,12 @@ class AppCacheRequestHandlerTest : public testing::Test {
   net::URLRequest::ProtocolFactory* orig_http_factory_;
 
   static scoped_ptr<base::Thread> io_thread_;
-  static URLRequestJob* mock_factory_job_;
+  static net::URLRequestJob* mock_factory_job_;
 };
 
 // static
 scoped_ptr<base::Thread> AppCacheRequestHandlerTest::io_thread_;
-URLRequestJob* AppCacheRequestHandlerTest::mock_factory_job_ = NULL;
+net::URLRequestJob* AppCacheRequestHandlerTest::mock_factory_job_ = NULL;
 
 TEST_F(AppCacheRequestHandlerTest, MainResource_Miss) {
   RunTestOnIOThread(&AppCacheRequestHandlerTest::MainResource_Miss);
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc
index 543ece5..f4aacf2 100644
--- a/webkit/appcache/appcache_update_job_unittest.cc
+++ b/webkit/appcache/appcache_update_job_unittest.cc
@@ -41,8 +41,8 @@ class MockHttpServer {
     return GURL("http://mockhost/" + path);
   }
 
-  static URLRequestJob* JobFactory(net::URLRequest* request,
-                                   const std::string& scheme) {
+  static net::URLRequestJob* JobFactory(net::URLRequest* request,
+                                        const std::string& scheme) {
     if (request->url().host() != "mockhost")
       return new URLRequestErrorJob(request, -1);
 
@@ -287,8 +287,8 @@ class MockFrontend : public AppCacheFrontend {
 };
 
 // Helper factories to simulate redirected URL responses for tests.
-static URLRequestJob* RedirectFactory(net::URLRequest* request,
-                                      const std::string& scheme) {
+static net::URLRequestJob* RedirectFactory(net::URLRequest* request,
+                                           const std::string& scheme) {
   return new URLRequestTestJob(request,
                                URLRequestTestJob::test_redirect_headers(),
                                URLRequestTestJob::test_data_1(),
@@ -322,8 +322,8 @@ class RetryRequestTestJob : public URLRequestTestJob {
     expected_requests_ = 0;
   }
 
-  static URLRequestJob* RetryFactory(net::URLRequest* request,
-                                     const std::string& scheme) {
+  static net::URLRequestJob* RetryFactory(net::URLRequest* request,
+                                          const std::string& scheme) {
     ++num_requests_;
     if (num_retries_ > 0 && request->original_url() == kRetryUrl) {
       --num_retries_;
@@ -424,8 +424,8 @@ class HttpHeadersRequestTestJob : public URLRequestTestJob {
     already_checked_ = false;
   }
 
-  static URLRequestJob* IfModifiedSinceFactory(net::URLRequest* request,
-                                               const std::string& scheme) {
+  static net::URLRequestJob* IfModifiedSinceFactory(net::URLRequest* request,
+                                                    const std::string& scheme) {
     if (!already_checked_) {
       already_checked_ = true;  // only check once for a test
       const net::HttpRequestHeaders& extra_headers =
diff --git a/webkit/appcache/appcache_url_request_job.cc b/webkit/appcache/appcache_url_request_job.cc
index 6a61674..9dc19ea 100644
--- a/webkit/appcache/appcache_url_request_job.cc
+++ b/webkit/appcache/appcache_url_request_job.cc
@@ -22,7 +22,7 @@ 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),
@@ -197,7 +197,7 @@ void AppCacheURLRequestJob::OnReadComplete(int result) {
   NotifyReadComplete(result);
 }
 
-// URLRequestJob overrides ------------------------------------------------
+// net::URLRequestJob overrides ------------------------------------------------
 
 void AppCacheURLRequestJob::Start() {
   DCHECK(!has_been_started());
@@ -213,7 +213,7 @@ void AppCacheURLRequestJob::Kill() {
       storage_->CancelDelegateCallbacks(this);
       storage_ = NULL;
     }
-    URLRequestJob::Kill();
+    net::URLRequestJob::Kill();
     method_factory_.RevokeAll();
   }
 }
diff --git a/webkit/appcache/appcache_url_request_job.h b/webkit/appcache/appcache_url_request_job.h
index 7491e71..2b97291 100644
--- a/webkit/appcache/appcache_url_request_job.h
+++ b/webkit/appcache/appcache_url_request_job.h
@@ -16,7 +16,7 @@
 
 namespace appcache {
 
-// A URLRequestJob derivative that knows how to return a response stored
+// A net::URLRequestJob derivative that knows how to return a response stored
 // in the appcache.
 class AppCacheURLRequestJob : public net::URLRequestJob,
                               public AppCacheStorage::Delegate {
@@ -55,7 +55,7 @@ class AppCacheURLRequestJob : public net::URLRequestJob,
   int64 cache_id() { return cache_id_; }
   const AppCacheEntry& entry() { return entry_; }
 
-  // URLRequestJob's Kill method is made public so the users of this
+  // net::URLRequestJob's Kill method is made public so the users of this
   // class in the appcache namespace can call it.
   virtual void Kill();
 
@@ -104,7 +104,7 @@ class AppCacheURLRequestJob : public net::URLRequestJob,
   // AppCacheResponseReader completion callback
   void OnReadComplete(int result);
 
-  // URLRequestJob methods, see url_request_job.h for doc comments
+  // net::URLRequestJob methods, see url_request_job.h for doc comments
   virtual void Start();
   virtual net::LoadState GetLoadState() const;
   virtual bool GetCharset(std::string* charset);
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index b64f079b..a282b42 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -124,10 +124,10 @@ class AppCacheURLRequestJobTest : public testing::Test {
     bool kill_with_io_pending_;
   };
 
-  static URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
-                                           const std::string& scheme) {
+  static net::URLRequestJob* MockHttpJobFactory(net::URLRequest* request,
+                                                const std::string& scheme) {
     if (mock_factory_job_) {
-      URLRequestJob* temp = mock_factory_job_;
+      net::URLRequestJob* temp = mock_factory_job_;
       mock_factory_job_ = NULL;
       return temp;
     } else {
diff --git a/webkit/appcache/view_appcache_internals_job.h b/webkit/appcache/view_appcache_internals_job.h
index 0131da2..d9a705a 100644
--- a/webkit/appcache/view_appcache_internals_job.h
+++ b/webkit/appcache/view_appcache_internals_job.h
@@ -30,7 +30,7 @@ class ViewAppCacheInternalsJob : public URLRequestSimpleJob {
                        std::string* charset,
                        std::string* data) const;
 
-  // Overridden method from URLRequestJob.
+  // Overridden method from net::URLRequestJob.
   virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
 
  private: