Move url_request_mock_http_job to net/test/url_request/

chrome/browser/prerender/prerender_browsertest.cc

Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 73b94ad7a1c514b1a31e10ac18e73f1ef98a2618..464c22e85723b2dff67b3a6085d80ca002d725fa 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -81,13 +81,13 @@
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
-#include "content/test/net/url_request_mock_http_job.h"
 #include "extensions/common/switches.h"
 #include "net/base/escape.h"
 #include "net/cert/x509_certificate.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/ssl/ssl_cert_request_info.h"
+#include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_filter.h"
@@ -797,7 +797,13 @@ class HangingFirstRequestInterceptor : public net::URLRequestInterceptor {
       }
       return new HangingURLRequestJob(request, network_delegate);
     }
-    return new content::URLRequestMockHTTPJob(request, network_delegate, file_);
+    return new net::URLRequestMockHTTPJob(
+        request,
+        network_delegate,
+        file_,
+        content::BrowserThread::GetBlockingPool()
+            ->GetTaskRunnerWithShutdownBehavior(
+                base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
   }
 
  private:
@@ -819,13 +825,18 @@ void CreateHangingFirstRequestInterceptorOnIO(
 }
 
 // Wrapper over URLRequestMockHTTPJob that exposes extra callbacks.
-class MockHTTPJob : public content::URLRequestMockHTTPJob {
+class MockHTTPJob : public net::URLRequestMockHTTPJob {
  public:
   MockHTTPJob(net::URLRequest* request,
               net::NetworkDelegate* delegate,
               const base::FilePath& file)
-      : content::URLRequestMockHTTPJob(request, delegate, file) {
-  }
+      : net::URLRequestMockHTTPJob(
+            request,
+            delegate,
+            file,
+            content::BrowserThread::GetBlockingPool()
+                ->GetTaskRunnerWithShutdownBehavior(
+                    base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)) {}
 
   void set_start_callback(const base::Closure& start_callback) {
     start_callback_ = start_callback;
@@ -834,7 +845,7 @@ class MockHTTPJob : public content::URLRequestMockHTTPJob {
   virtual void Start() OVERRIDE {
     if (!start_callback_.is_null())
       start_callback_.Run();
-    content::URLRequestMockHTTPJob::Start();
+    net::URLRequestMockHTTPJob::Start();
   }
 
  private:
@@ -924,7 +935,8 @@ void CreateMockInterceptorOnIO(const GURL& url, const base::FilePath& file) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   net::URLRequestFilter::GetInstance()->AddUrlInterceptor(
       url,
-      content::URLRequestMockHTTPJob::CreateInterceptorForSingleFile(file));
+      net::URLRequestMockHTTPJob::CreateInterceptorForSingleFile(
+          file, content::BrowserThread::GetBlockingPool()));
 }
 
 // A ContentBrowserClient that cancels all prerenderers on OpenURL.