Give more request types a TransportSecurityState.

webkit/support/test_shell_request_context.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 "webkit/support/test_shell_request_context.h"
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "net/base/cache_type.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/dns/host_resolver.h"
 #include "net/http/http_auth_handler_factory.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_config_service.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/default_server_bound_cert_store.h"
 #include "net/ssl/server_bound_cert_service.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/http_user_agent_settings.h"
 #include "net/url_request/url_request_job_factory_impl.h"
@@ skipping 48 matching lines @@
       base::WorkerPool::GetTaskRunner(true)));
 
   storage_.set_http_user_agent_settings(new TestShellHttpUserAgentSettings);
 
   // Use no proxy; it's not needed for testing and just breaks things.
   scoped_ptr<net::ProxyConfigService> proxy_config_service(
       new net::ProxyConfigServiceFixed(net::ProxyConfig()));
 
   storage_.set_host_resolver(net::HostResolver::CreateDefaultResolver(NULL));
   storage_.set_cert_verifier(net::CertVerifier::CreateDefault());
+  storage_.set_transport_security_state(new net::TransportSecurityState);
   storage_.set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
       proxy_config_service.release(), 0, NULL));
   storage_.set_ssl_config_service(
       new net::SSLConfigServiceDefaults);
 
   storage_.set_http_auth_handler_factory(
       net::HttpAuthHandlerFactory::CreateDefault(host_resolver()));
   storage_.set_http_server_properties(
       new net::HttpServerPropertiesImpl);
 
   net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend(
       cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE,
       net::CACHE_BACKEND_DEFAULT,
       cache_path,
       0,
       SimpleResourceLoaderBridge::GetCacheThread().get());
 
   net::HttpNetworkSession::Params network_session_params;
   network_session_params.host_resolver = host_resolver();
   network_session_params.cert_verifier = cert_verifier();
+  network_session_params.transport_security_state = transport_security_state();
   network_session_params.server_bound_cert_service =
       server_bound_cert_service();
   network_session_params.proxy_service = proxy_service();
   network_session_params.ssl_config_service = ssl_config_service();
   network_session_params.http_auth_handler_factory =
       http_auth_handler_factory();
   network_session_params.http_server_properties = http_server_properties();
   network_session_params.host_resolver = host_resolver();
 
   net::HttpCache* cache = new net::HttpCache(
@@ skipping 16 matching lines @@
   job_factory->SetProtocolHandler(
       "filesystem",
       fileapi::CreateFileSystemProtocolHandler(file_system_context_.get()));
   job_factory->SetProtocolHandler("data", new net::DataProtocolHandler);
   job_factory->SetProtocolHandler("file", new net::FileProtocolHandler);
   storage_.set_job_factory(job_factory);
 }
 
 TestShellRequestContext::~TestShellRequestContext() {
 }