Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

content/test/net/url_request_abort_on_end_job.cc

 // Copyright (c) 2012 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.
 // This class simulates what wininet does when a dns lookup fails.
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/test/net/url_request_abort_on_end_job.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_status.h"
 
 namespace content {
 namespace {
+
 const char kPageContent[] = "some data\r\n";
-}
 
-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::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() {
+  BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
+                          base::Bind(AddUrlHandlerOnIOThread));
+}
+
 // Private const version.
 void URLRequestAbortOnEndJob::GetResponseInfoConst(
     net::HttpResponseInfo* info) const {
   // Send back mock headers.
   std::string raw_headers;
   if (LowerCaseEqualsASCII(k400AbortOnEndUrl,
                            request_->url().spec().c_str())) {
     raw_headers.append(
       "HTTP/1.1 400 This is not OK\n"
       "Content-type: text/plain\n");
@@ skipping 46 matching lines @@
     return true;
   }
 
   SetStatus(net::URLRequestStatus(net::URLRequestStatus::FAILED,
                                   net::ERR_CONNECTION_ABORTED));
   *bytes_read = -1;
   return false;
 }
 
 }  // namespace content