Give more request types a TransportSecurityState.

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 "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.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/dns/mock_host_resolver.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/ssl/default_server_bound_cert_store.h"
 #include "net/ssl/server_bound_cert_service.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
@@ skipping 38 matching lines @@
   DCHECK(!initialized_);
   initialized_ = true;
 
   if (!host_resolver())
     context_storage_.set_host_resolver(
         scoped_ptr<HostResolver>(new MockCachingHostResolver()));
   if (!proxy_service())
     context_storage_.set_proxy_service(ProxyService::CreateDirect());
   if (!cert_verifier())
     context_storage_.set_cert_verifier(CertVerifier::CreateDefault());
+  if (!transport_security_state())
+    context_storage_.set_transport_security_state(new TransportSecurityState);
   if (!ssl_config_service())
     context_storage_.set_ssl_config_service(new SSLConfigServiceDefaults);
   if (!http_auth_handler_factory()) {
     context_storage_.set_http_auth_handler_factory(
         HttpAuthHandlerFactory::CreateDefault(host_resolver()));
   }
   if (!http_server_properties()) {
     context_storage_.set_http_server_properties(
         new HttpServerPropertiesImpl);
   }
   if (!transport_security_state()) {
     context_storage_.set_transport_security_state(
         new TransportSecurityState());
   }
   if (http_transaction_factory()) {
     // Make sure we haven't been passed an object we're not going to use.
     EXPECT_FALSE(client_socket_factory_);
   } else {
     HttpNetworkSession::Params params;
     params.client_socket_factory = client_socket_factory();
     params.host_resolver = host_resolver();
     params.cert_verifier = cert_verifier();
+    params.transport_security_state = transport_security_state();
     params.proxy_service = proxy_service();
     params.ssl_config_service = ssl_config_service();
     params.http_auth_handler_factory = http_auth_handler_factory();
     params.network_delegate = network_delegate();
     params.http_server_properties = http_server_properties();
     params.net_log = net_log();
     context_storage_.set_http_transaction_factory(new HttpCache(
         new HttpNetworkSession(params),
         HttpCache::DefaultBackend::InMemory(0)));
   }
@@ skipping 474 matching lines @@
   URLRequestJob* job = main_intercept_job_;
   main_intercept_job_ = NULL;
   return job;
 }
 
 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) {
   main_intercept_job_ = job;
 }
 
 }  // namespace net