net: Remove typedef net::URLRequestTestJob URLRequestTestJob;

BUG=64263
TEST=compiled locally, trybots

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

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

4 files changed, 28 insertions, 31 deletions

diff --git a/net/url_request/url_request_job_tracker_unittest.cc b/net/url_request/url_request_job_tracker_unittest.cc
index bd62ef7..31818ac 100644
--- a/net/url_request/url_request_job_tracker_unittest.cc
+++ b/net/url_request/url_request_job_tracker_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -64,7 +64,7 @@ class MockJobObserver : public net::URLRequestJobTracker::JobObserver {
 };
 
 // A net::URLRequestJob that returns static content for given URLs. We do
-// not use URLRequestTestJob here because URLRequestTestJob fakes
+// not use net::URLRequestTestJob here because net::URLRequestTestJob fakes
 // async operations by calling ReadRawData synchronously in an async
 // callback. This test requires a net::URLRequestJob that returns false for
 // async reads, in order to exercise the real async read codepath.
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index 4aa7c16..0d0bc5d 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -13,13 +13,13 @@
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 
+namespace net {
+
 // This emulates the global message loop for the test URL request class, since
 // this is only test code, it's probably not too dangerous to have this static
 // object.
 static std::vector< scoped_refptr<URLRequestTestJob> > g_pending_jobs;
 
-namespace net {
-
 // static getters for known URLs
 GURL URLRequestTestJob::test_url_1() {
   return GURL("test:url1");
diff --git a/net/url_request/url_request_test_job.h b/net/url_request/url_request_test_job.h
index 252c173..133565e 100644
--- a/net/url_request/url_request_test_job.h
+++ b/net/url_request/url_request_test_job.h
@@ -138,7 +138,4 @@ class URLRequestTestJob : public URLRequestJob {
 
 }  // namespace net
 
-// TODO(tfarina): Fix the callers and remove this!
-typedef net::URLRequestTestJob URLRequestTestJob;
-
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_JOB_H_
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 4be2ec5..11a313b 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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.
 
@@ -1820,10 +1820,10 @@ TEST_F(URLRequestTestHTTP, Post307RedirectPost) {
 }
 
 // Custom URLRequestJobs for use with interceptor tests
-class RestartTestJob : public URLRequestTestJob {
+class RestartTestJob : public net::URLRequestTestJob {
  public:
   explicit RestartTestJob(net::URLRequest* request)
-    : URLRequestTestJob(request, true) {}
+    : net::URLRequestTestJob(request, true) {}
  protected:
   virtual void StartAsync() {
     this->NotifyRestartRequired();
@@ -1832,10 +1832,10 @@ class RestartTestJob : public URLRequestTestJob {
   ~RestartTestJob() {}
 };
 
-class CancelTestJob : public URLRequestTestJob {
+class CancelTestJob : public net::URLRequestTestJob {
  public:
   explicit CancelTestJob(net::URLRequest* request)
-    : URLRequestTestJob(request, true) {}
+    : net::URLRequestTestJob(request, true) {}
  protected:
   virtual void StartAsync() {
     request_->Cancel();
@@ -1844,10 +1844,10 @@ class CancelTestJob : public URLRequestTestJob {
   ~CancelTestJob() {}
 };
 
-class CancelThenRestartTestJob : public URLRequestTestJob {
+class CancelThenRestartTestJob : public net::URLRequestTestJob {
  public:
   explicit CancelThenRestartTestJob(net::URLRequest* request)
-      : URLRequestTestJob(request, true) {
+      : net::URLRequestTestJob(request, true) {
   }
  protected:
   virtual void StartAsync() {
@@ -1899,16 +1899,16 @@ class TestInterceptor : net::URLRequest::Interceptor {
       simulate_main_network_error_ = false;
       did_simulate_error_main_ = true;
       // will error since the requeted url is not one of its canned urls
-      return new URLRequestTestJob(request, true);
+      return new net::URLRequestTestJob(request, true);
     }
     if (!intercept_main_request_)
       return NULL;
     intercept_main_request_ = false;
     did_intercept_main_ = true;
-    return new URLRequestTestJob(request,
-                                 main_headers_,
-                                 main_data_,
-                                 true);
+    return new net::URLRequestTestJob(request,
+                                      main_headers_,
+                                      main_data_,
+                                      true);
   }
 
   virtual net::URLRequestJob* MaybeInterceptRedirect(net::URLRequest* request,
@@ -1922,10 +1922,10 @@ class TestInterceptor : net::URLRequest::Interceptor {
       return NULL;
     intercept_redirect_ = false;
     did_intercept_redirect_ = true;
-    return new URLRequestTestJob(request,
-                                 redirect_headers_,
-                                 redirect_data_,
-                                 true);
+    return new net::URLRequestTestJob(request,
+                                      redirect_headers_,
+                                      redirect_data_,
+                                      true);
   }
 
   virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request) {
@@ -1938,10 +1938,10 @@ class TestInterceptor : net::URLRequest::Interceptor {
       return NULL;
     intercept_final_response_ = false;
     did_intercept_final_ = true;
-    return new URLRequestTestJob(request,
-                                 final_headers_,
-                                 final_data_,
-                                 true);
+    return new net::URLRequestTestJob(request,
+                                      final_headers_,
+                                      final_data_,
+                                      true);
   }
 
   // Whether to intercept the main request, and if so the response to return.
@@ -1985,11 +1985,11 @@ class TestInterceptor : net::URLRequest::Interceptor {
   // Static getters for canned response header and data strings
 
   static std::string ok_data() {
-    return URLRequestTestJob::test_data_1();
+    return net::URLRequestTestJob::test_data_1();
   }
 
   static std::string ok_headers() {
-    return URLRequestTestJob::test_headers();
+    return net::URLRequestTestJob::test_headers();
   }
 
   static std::string redirect_data() {
@@ -1997,7 +1997,7 @@ class TestInterceptor : net::URLRequest::Interceptor {
   }
 
   static std::string redirect_headers() {
-    return URLRequestTestJob::test_redirect_headers();
+    return net::URLRequestTestJob::test_redirect_headers();
   }
 
   static std::string error_data() {
@@ -2005,7 +2005,7 @@ class TestInterceptor : net::URLRequest::Interceptor {
   }
 
   static std::string error_headers() {
-    return URLRequestTestJob::test_error_headers();
+    return net::URLRequestTestJob::test_error_headers();
   }
 };