net: Remove typedef net::URLRequestJob URLRequestJob;

webkit/appcache/appcache_request_handler_unittest.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 <stack>
 #include <string>
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/thread.h"
@@ skipping 53 matching lines @@
     }
 
    private:
     AppCacheRequestHandlerTest* test_;
     Method method_;
   };
 
   // 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_;
   };
 
   class MockURLRequest : public net::URLRequest {
    public:
     explicit MockURLRequest(const GURL& url) : net::URLRequest(url, NULL) {}
 
     void SimulateResponseCode(int http_response_code) {
       mock_factory_job_ = new MockURLRequestJob(this, http_response_code);
       Start();
       DCHECK(!mock_factory_job_);
       // All our simulation need to do satisfy are the following two DCHECKs
       DCHECK(status().is_success());
       DCHECK_EQ(http_response_code, GetResponseCode());
     }
   };
 
-  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 {
       // Some of these tests trigger UpdateJobs which start URLRequests.
       // We short circuit those be returning error jobs.
       return new URLRequestErrorJob(request, net::ERR_INTERNET_DISCONNECTED);
     }
   }
 
   static void SetUpTestCase() {
@@ skipping 550 matching lines @@
   scoped_ptr<MockAppCacheService> mock_service_;
   scoped_ptr<AppCacheBackendImpl> backend_impl_;
   scoped_ptr<MockFrontend> mock_frontend_;
   AppCacheHost* host_;
   scoped_ptr<MockURLRequest> request_;
   scoped_ptr<AppCacheRequestHandler> handler_;
   scoped_refptr<AppCacheURLRequestJob> job_;
   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);
 }
 
 TEST_F(AppCacheRequestHandlerTest, MainResource_Hit) {
   RunTestOnIOThread(&AppCacheRequestHandlerTest::MainResource_Hit);
 }
 
 TEST_F(AppCacheRequestHandlerTest, MainResource_Fallback) {
@@ skipping 51 matching lines @@
 
 TEST_F(AppCacheRequestHandlerTest, WorkerRequest) {
   RunTestOnIOThread(&AppCacheRequestHandlerTest::WorkerRequest);
 }
 
 }  // namespace appcache
 
 // AppCacheRequestHandlerTest is expected to always live longer than the
 // runnable methods.  This lets us call NewRunnableMethod on its instances.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(appcache::AppCacheRequestHandlerTest);