Add HttpProtocolHandler and convert everything to use it

net/url_request/url_request_test_util.cc

Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 3f9ffb53fef1f3f9758b9cdef15cbfad1072443d..bf984948257da8559c737604e8168ed5561e05d9 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -25,6 +25,7 @@
 #include "net/http/transport_security_state.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
+#include "net/url_request/http_protocol_handler.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
@@ -139,7 +140,7 @@ void TestURLRequestContext::Init() {
   }
   if (!job_factory()) {
     context_storage_.set_job_factory(
-        base::WrapUnique(new URLRequestJobFactoryImpl()));
+        URLRequestJobFactoryImpl::CreateWithDefaultProtocolHandlers());
   }
 }
 
@@ -647,14 +648,19 @@ bool TestNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
   return cancel_request_with_policy_violating_referrer_;
 }
 
-TestJobInterceptor::TestJobInterceptor() {}
+TestJobInterceptor::TestJobInterceptor() {
+  http_protocol_handler_ = base::WrapUnique(new HttpProtocolHandler);
+}
 
 TestJobInterceptor::~TestJobInterceptor() {}
 
 URLRequestJob* TestJobInterceptor::MaybeCreateJob(
     URLRequest* request,
     NetworkDelegate* network_delegate) const {
-  return main_intercept_job_.release();
+  URLRequestJob* job = main_intercept_job_.release();
+  if (job)
+    return job;
+  return http_protocol_handler_->MaybeCreateJob(request, network_delegate);

[mmenke, 2016/04/21 20:58:01]

How hard would it be to make TestJobInterceptor a URLRequestJobInterceptor
instead?  Then it would just sit on top of a URLRequestJobFactoryImp that
handled HTTP itself, instead.  I think only 3 or 4 test fixtures us this class?

[mgersh, 2016/04/22 20:27:15]

It's enough work that I'd rather not bundle it with this CL, if that's okay with
you. The main difficulty is that I'm not seeing a convenient way to add an
interceptor without having to untangle the weird job factory structure of the
tests.

[mmenke, 2016/04/22 20:41:04]

Unconditionally calling directly into our own private http_protocol_handler is
weird enough that I think even if the change is too much for this CL, we should
try and come up with something better in this CL.  Or we could change this to an
interceptor in a preliminay CL, before landing this one.

[mgersh, 2016/04/27 16:13:52]

Okay, I changed it to an interceptor here.

 }
 
 void TestJobInterceptor::set_main_intercept_job(