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/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
 #include "net/base/host_port_pair.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/ct_policy_enforcer.h"
 #include "net/cert/multi_log_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/proxy/proxy_retry_info.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 99 matching lines @@
         context_storage_.http_network_session(),
         HttpCache::DefaultBackend::InMemory(0), false));
   }
   if (!http_user_agent_settings()) {
     context_storage_.set_http_user_agent_settings(
         base::MakeUnique<StaticHttpUserAgentSettings>("en-us,fr",
                                                       std::string()));
   }
   if (!job_factory()) {
     context_storage_.set_job_factory(
-        base::MakeUnique<URLRequestJobFactoryImpl>());
+        URLRequestJobFactoryImpl::CreateWithHttpProtocolHandlers());
   }
 }
 
 TestURLRequestContextGetter::TestURLRequestContextGetter(
     const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner)
     : network_task_runner_(network_task_runner) {
   DCHECK(network_task_runner_.get());
 }
 
 TestURLRequestContextGetter::TestURLRequestContextGetter(
@@ skipping 494 matching lines @@
     const URLRequest& request,
     const GURL& target_url,
     const GURL& referrer_url) const {
   return cancel_request_with_policy_violating_referrer_;
 }
 
 TestJobInterceptor::TestJobInterceptor() {}
 
 TestJobInterceptor::~TestJobInterceptor() {}
 
-URLRequestJob* TestJobInterceptor::MaybeCreateJob(
+URLRequestJob* TestJobInterceptor::MaybeInterceptRequest(
     URLRequest* request,
     NetworkDelegate* network_delegate) const {
   return main_intercept_job_.release();
 }
 
+URLRequestJob* TestJobInterceptor::MaybeInterceptRedirect(
+    URLRequest* request,
+    NetworkDelegate* network_delegate,
+    const GURL& location) const {
+  return nullptr;
+}
+
+URLRequestJob* TestJobInterceptor::MaybeInterceptResponse(
+    URLRequest* request,
+    NetworkDelegate* network_delegate) const {
+  return nullptr;
+}
+
 void TestJobInterceptor::set_main_intercept_job(
     std::unique_ptr<URLRequestJob> job) {
   main_intercept_job_ = std::move(job);
 }
 
 }  // namespace net