Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

content/test/net/url_request_abort_on_end_job.cc

Index: content/test/net/url_request_abort_on_end_job.cc
diff --git a/content/test/net/url_request_abort_on_end_job.cc b/content/test/net/url_request_abort_on_end_job.cc
index 67d10a4a24688eaa065f59e65e611ae4c11d3407..4d4914549a5a89df517372c9845e70cf518fb891 100644
--- a/content/test/net/url_request_abort_on_end_job.cc
+++ b/content/test/net/url_request_abort_on_end_job.cc
@@ -19,26 +19,33 @@
 
 namespace content {
 namespace {
+
 const char kPageContent[] = "some data\r\n";
+
+net::URLRequestJob* JobFactory(
+    net::URLRequest* request,
+    net::NetworkDelegate* network_delegate,
+    const std::string& scheme) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  return new URLRequestAbortOnEndJob(request, network_delegate);
+}
+
+void AddUrlHandlerOnIOThread() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
+  filter->AddUrlHandler(GURL(URLRequestAbortOnEndJob::k400AbortOnEndUrl),
+                        &JobFactory);
 }
 
+}  // anonymous namespace
+
 const char URLRequestAbortOnEndJob::k400AbortOnEndUrl[] =
     "http://url.handled.by.abort.on.end/400";
 
 // static
 void URLRequestAbortOnEndJob::AddUrlHandler() {
-  net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
-  filter->AddUrlHandler(GURL(k400AbortOnEndUrl),
-                        &URLRequestAbortOnEndJob::Factory);
-}
-
-// static
-net::URLRequestJob* URLRequestAbortOnEndJob::Factory(
-    net::URLRequest* request,
-    net::NetworkDelegate* network_delegate,
-    const std::string& scheme) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return new URLRequestAbortOnEndJob(request, network_delegate);
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(AddUrlHandlerOnIOThread));
 }
 
 // Private const version.