Add HttpProtocolHandler and convert everything to use it

net/url_request/url_request_test_util.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.
 
 #include "net/url_request/url_request_test_util.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/threading/worker_pool.h"
 #include "net/base/host_port_pair.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/ct_verifier.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_server_properties_impl.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 // These constants put the NetworkDelegate events of TestNetworkDelegate
@@ skipping 94 matching lines @@
     context_storage_.set_http_transaction_factory(base::WrapUnique(
         new HttpCache(context_storage_.http_network_session(),
                       HttpCache::DefaultBackend::InMemory(0), false)));
   }
   if (!http_user_agent_settings()) {
     context_storage_.set_http_user_agent_settings(base::WrapUnique(
         new StaticHttpUserAgentSettings("en-us,fr", std::string())));
   }
   if (!job_factory()) {
     context_storage_.set_job_factory(
-        base::WrapUnique(new URLRequestJobFactoryImpl()));
+        URLRequestJobFactoryImpl::CreateWithDefaultProtocolHandlers());
   }
 }
 
 TestURLRequestContextGetter::TestURLRequestContextGetter(
     const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner)
     : network_task_runner_(network_task_runner) {
   DCHECK(network_task_runner_.get());
 }
 
 TestURLRequestContextGetter::TestURLRequestContextGetter(
@@ skipping 487 matching lines @@
   return experimental_cookie_features_enabled_;
 }
 
 bool TestNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
     const URLRequest& request,
     const GURL& target_url,
     const GURL& referrer_url) const {
   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(
     std::unique_ptr<URLRequestJob> job) {
   main_intercept_job_ = std::move(job);
 }
 
 }  // namespace net