headless: Migrate to URLRequestContextBuilder

headless/lib/browser/headless_url_request_context_getter.cc

Index: headless/lib/browser/headless_url_request_context_getter.cc
diff --git a/headless/lib/browser/headless_url_request_context_getter.cc b/headless/lib/browser/headless_url_request_context_getter.cc
index f185e8bc20e9a599a83705c9d0fa4da6406d9593..32645f9829c89e28726e069f84fd2aba8a6e8621 100644
--- a/headless/lib/browser/headless_url_request_context_getter.cc
+++ b/headless/lib/browser/headless_url_request_context_getter.cc
@@ -8,62 +8,22 @@
 
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
-#include "base/threading/worker_pool.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/cookie_store_factory.h"
-#include "content/public/common/content_switches.h"
-#include "net/cert/cert_verifier.h"
-#include "net/cookies/cookie_store.h"
-#include "net/dns/host_resolver.h"
 #include "net/dns/mapped_host_resolver.h"
-#include "net/http/http_auth_handler_factory.h"
-#include "net/http/http_cache.h"
-#include "net/http/http_network_session.h"
-#include "net/http/http_server_properties_impl.h"
-#include "net/http/transport_security_state.h"
 #include "net/proxy/proxy_service.h"
-#include "net/ssl/channel_id_service.h"
-#include "net/ssl/default_channel_id_store.h"
-#include "net/ssl/ssl_config_service_defaults.h"
-#include "net/url_request/data_protocol_handler.h"
-#include "net/url_request/file_protocol_handler.h"
-#include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_storage.h"
-#include "net/url_request/url_request_intercepting_job_factory.h"
-#include "net/url_request/url_request_job_factory_impl.h"
+#include "net/url_request/url_request_context_builder.h"
 
 namespace headless {
 
-namespace {
-
-void InstallProtocolHandlers(net::URLRequestJobFactoryImpl* job_factory,
-                             content::ProtocolHandlerMap* protocol_handlers) {
-  for (content::ProtocolHandlerMap::iterator it = protocol_handlers->begin();
-       it != protocol_handlers->end(); ++it) {
-    bool set_protocol = job_factory->SetProtocolHandler(
-        it->first, base::WrapUnique(it->second.release()));
-    DCHECK(set_protocol);
-  }
-  protocol_handlers->clear();
-}
-
-}  // namespace
-
 HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter(
-    bool ignore_certificate_errors,
-    const base::FilePath& base_path,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors,
-    net::NetLog* net_log,
     HeadlessBrowser::Options* options)
-    : ignore_certificate_errors_(ignore_certificate_errors),
-      base_path_(base_path),
-      io_task_runner_(std::move(io_task_runner)),
+    : io_task_runner_(std::move(io_task_runner)),
       file_task_runner_(std::move(file_task_runner)),
-      net_log_(net_log),
       user_agent_(options->user_agent),
       host_resolver_rules_(options->host_resolver_rules),
       proxy_server_(options->proxy_server),
@@ -82,140 +42,55 @@ HeadlessURLRequestContextGetter::HeadlessURLRequestContextGetter(
   // We must create the proxy config service on the UI loop on Linux because it
   // must synchronously run on the glib message loop. This will be passed to
   // the URLRequestContextStorage on the IO thread in GetURLRequestContext().
-  if (proxy_server_.IsEmpty())
-    proxy_config_service_ = GetProxyConfigService();
+  if (proxy_server_.IsEmpty()) {
+    proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService(
+        io_task_runner_, file_task_runner_);
+  }
 }
 
 HeadlessURLRequestContextGetter::~HeadlessURLRequestContextGetter() {}
 
-std::unique_ptr<net::NetworkDelegate>
-HeadlessURLRequestContextGetter::CreateNetworkDelegate() {
-  return nullptr;
-}
-
-std::unique_ptr<net::ProxyConfigService>
-HeadlessURLRequestContextGetter::GetProxyConfigService() {
-  return net::ProxyService::CreateSystemProxyConfigService(io_task_runner_,
-                                                           file_task_runner_);
-}
-
-std::unique_ptr<net::ProxyService>
-HeadlessURLRequestContextGetter::GetProxyService() {
-  if (!proxy_server_.IsEmpty())
-    return net::ProxyService::CreateFixed(proxy_server_.ToString());
-  return net::ProxyService::CreateUsingSystemProxyResolver(
-      std::move(proxy_config_service_), 0, url_request_context_->net_log());
-}
-
 net::URLRequestContext*
 HeadlessURLRequestContextGetter::GetURLRequestContext() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
   if (!url_request_context_) {
-    url_request_context_.reset(new net::URLRequestContext());
-    url_request_context_->set_net_log(net_log_);
-    network_delegate_ = CreateNetworkDelegate();
-    url_request_context_->set_network_delegate(network_delegate_.get());
-    storage_.reset(
-        new net::URLRequestContextStorage(url_request_context_.get()));
-    storage_->set_cookie_store(
-        content::CreateCookieStore(content::CookieStoreConfig()));
-    storage_->set_channel_id_service(base::WrapUnique(
-        new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr),
-                                  base::WorkerPool::GetTaskRunner(true))));
+    net::URLRequestContextBuilder builder;
     // TODO(skyostil): Make language settings configurable.
-    storage_->set_http_user_agent_settings(base::WrapUnique(
-        new net::StaticHttpUserAgentSettings("en-us,en", user_agent_)));
-
-    std::unique_ptr<net::HostResolver> host_resolver(
-        net::HostResolver::CreateDefaultResolver(
-            url_request_context_->net_log()));
-
-    storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
-    storage_->set_transport_security_state(
-        base::WrapUnique(new net::TransportSecurityState));
-    storage_->set_proxy_service(GetProxyService());
-    storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
-    storage_->set_http_auth_handler_factory(
-        net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
-    storage_->set_http_server_properties(
-        base::WrapUnique(new net::HttpServerPropertiesImpl()));
-
-    base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
-    std::unique_ptr<net::HttpCache::DefaultBackend> main_backend(
-        new net::HttpCache::DefaultBackend(
-            net::DISK_CACHE, net::CACHE_BACKEND_DEFAULT, cache_path, 0,
-            content::BrowserThread::GetMessageLoopProxyForThread(
-                content::BrowserThread::CACHE)));
-
-    net::HttpNetworkSession::Params network_session_params;
-    network_session_params.cert_verifier =
-        url_request_context_->cert_verifier();
-    network_session_params.transport_security_state =
-        url_request_context_->transport_security_state();
-    network_session_params.channel_id_service =
-        url_request_context_->channel_id_service();
-    network_session_params.proxy_service =
-        url_request_context_->proxy_service();
-    network_session_params.ssl_config_service =
-        url_request_context_->ssl_config_service();
-    network_session_params.http_auth_handler_factory =
-        url_request_context_->http_auth_handler_factory();
-    network_session_params.http_server_properties =
-        url_request_context_->http_server_properties();
-    network_session_params.net_log = url_request_context_->net_log();
-    network_session_params.ignore_certificate_errors =
-        ignore_certificate_errors_;
+    builder.set_user_agent(user_agent_);
+    // TODO(skyostil): Make these configurable.
+    builder.set_data_enabled(true);
+    builder.set_file_enabled(true);
+    if (!proxy_server_.IsEmpty()) {
+      builder.set_proxy_service(
+          net::ProxyService::CreateFixed(proxy_server_.ToString()));
+    } else {
+      builder.set_proxy_config_service(std::move(proxy_config_service_));
+    }
+
     if (!host_resolver_rules_.empty()) {
+      std::unique_ptr<net::HostResolver> host_resolver(
+          net::HostResolver::CreateDefaultResolver(nullptr /* net_log */));
       std::unique_ptr<net::MappedHostResolver> mapped_host_resolver(
           new net::MappedHostResolver(std::move(host_resolver)));
       mapped_host_resolver->SetRulesFromString(host_resolver_rules_);
-      host_resolver = std::move(mapped_host_resolver);
+      builder.set_host_resolver(std::move(mapped_host_resolver));
     }
 
-    // Give |storage_| ownership at the end in case it's |mapped_host_resolver|.
-    storage_->set_host_resolver(std::move(host_resolver));
-    network_session_params.host_resolver =
-        url_request_context_->host_resolver();
-
-    storage_->set_http_network_session(
-        base::WrapUnique(new net::HttpNetworkSession(network_session_params)));
-    storage_->set_http_transaction_factory(base::WrapUnique(new net::HttpCache(
-        storage_->http_network_session(), std::move(main_backend),
-        true /* set_up_quic_server_info */)));
-
-    std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
-        new net::URLRequestJobFactoryImpl());
-
-    // Install handlers for default protocols which aren't handled by the
-    // network layer.
-    if (protocol_handlers_.find(url::kDataScheme) == protocol_handlers_.end()) {
-      protocol_handlers_[url::kDataScheme] =
-          linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-              new net::DataProtocolHandler());
-    }
-    if (protocol_handlers_.find(url::kFileScheme) == protocol_handlers_.end()) {
-      protocol_handlers_[url::kFileScheme] =
-          linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
-              new net::FileProtocolHandler(
-                  content::BrowserThread::GetBlockingPool()
-                      ->GetTaskRunnerWithShutdownBehavior(
-                          base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
+    for (auto& pair : protocol_handlers_) {
+      builder.SetProtocolHandler(pair.first,
+                                 base::WrapUnique(pair.second.release()));
     }
-    InstallProtocolHandlers(job_factory.get(), &protocol_handlers_);
-
-    // Set up interceptors in the reverse order so that the last inceptor is at
-    // the end of the linked list of job factories.
-    std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
-        std::move(job_factory);
-    for (auto i = request_interceptors_.rbegin();
-         i != request_interceptors_.rend(); ++i) {
-      top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
-          std::move(top_job_factory), base::WrapUnique(*i)));
+    protocol_handlers_.clear();
+
+    std::vector<std::unique_ptr<net::URLRequestInterceptor>>
+        request_interceptors;
+    for (auto it : request_interceptors_) {
+      request_interceptors.push_back(base::WrapUnique(it));
     }
     request_interceptors_.weak_clear();
-    // Save the head of the job factory list at storage_.
-    storage_->set_job_factory(std::move(top_job_factory));
+    builder.SetInterceptors(std::move(request_interceptors));
+
+    url_request_context_ = builder.Build();
   }
 
   return url_request_context_.get();