Move TestJobInterceptor to url_request_test_util.

TestJobInterceptor is now accessible to other tests.

BUG=None


Review URL: https://chromiumcodereview.appspot.com/10919317

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

3 files changed, 52 insertions, 35 deletions

diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 5388b49..822cecc 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -528,3 +528,31 @@ ScopedCustomUrlRequestTestHttpHost::~ScopedCustomUrlRequestTestHttpHost() {
 const std::string& ScopedCustomUrlRequestTestHttpHost::value() {
   return value_;
 }
+
+TestJobInterceptor::TestJobInterceptor() : main_intercept_job_(NULL) {
+}
+
+net::URLRequestJob* TestJobInterceptor::MaybeIntercept(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const {
+  net::URLRequestJob* job = main_intercept_job_;
+  main_intercept_job_ = NULL;
+  return job;
+}
+
+net::URLRequestJob* TestJobInterceptor::MaybeInterceptRedirect(
+      const GURL& location,
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const {
+  return NULL;
+}
+
+net::URLRequestJob* TestJobInterceptor::MaybeInterceptResponse(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const {
+  return NULL;
+}
+
+void TestJobInterceptor::set_main_intercept_job(net::URLRequestJob* job) {
+  main_intercept_job_ = job;
+}
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index a317888..e63e1f069 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -37,6 +37,7 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_context_storage.h"
+#include "net/url_request/url_request_job_factory.h"
 
 using base::TimeDelta;
 
@@ -296,4 +297,27 @@ class ScopedCustomUrlRequestTestHttpHost {
   DISALLOW_COPY_AND_ASSIGN(ScopedCustomUrlRequestTestHttpHost);
 };
 
+//-----------------------------------------------------------------------------
+
+// A simple Interceptor that returns a pre-built URLRequestJob only once.
+class TestJobInterceptor : public net::URLRequestJobFactory::Interceptor {
+ public:
+  TestJobInterceptor();
+
+  virtual net::URLRequestJob* MaybeIntercept(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE;
+  virtual net::URLRequestJob* MaybeInterceptRedirect(
+      const GURL& location,
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE;
+  virtual net::URLRequestJob* MaybeInterceptResponse(
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE;
+  void set_main_intercept_job(net::URLRequestJob* job);
+
+ private:
+  mutable net::URLRequestJob* main_intercept_job_;
+};
+
 #endif  // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 17f6029..c1cefe4 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -355,41 +355,6 @@ class BlockingNetworkDelegateWithManualCallback : public TestNetworkDelegate {
   AuthCallback auth_callback_;
 };
 
-
-// A simple Interceptor that returns a pre-built URLRequestJob one time.
-class TestJobInterceptor : public URLRequestJobFactory::Interceptor {
- public:
-  TestJobInterceptor()
-      : main_intercept_job_(NULL) {
-  }
-
-  virtual URLRequestJob* MaybeIntercept(
-      URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE {
-    URLRequestJob* job = main_intercept_job_;
-    main_intercept_job_ = NULL;
-    return job;
-  }
-
-  virtual URLRequestJob* MaybeInterceptRedirect(
-      const GURL& location,
-      URLRequest* request,
-      NetworkDelegate* network_delegate) const OVERRIDE {
-    return NULL;
-  }
-
-  virtual URLRequestJob* MaybeInterceptResponse(
-      URLRequest* request, NetworkDelegate* network_delegate) const OVERRIDE {
-    return NULL;
-  }
-
-  void set_main_intercept_job(URLRequestJob* job) {
-    main_intercept_job_ = job;
-  }
-
- private:
-  mutable URLRequestJob* main_intercept_job_;
-};
-
 class TestURLRequestContextWithProxy : public TestURLRequestContext {
  public:
   // Does not own |delegate|.