Give more request types a TransportSecurityState.

chrome/browser/net/connection_tester_unittest.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 "chrome/browser/net/connection_tester.h"
 
 #include "base/prefs/testing_pref_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_network_layer.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_fixed.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 using content::BrowserThread;
 
@@ skipping 75 matching lines @@
   // ObserverListThreadSave to shut down properly.  For example,
   // SSLClientAuthCache calls RemoveObserver when destroyed, but if the
   // MessageLoop is already destroyed, then the RemoveObserver will be a
   // no-op, and the ObserverList will contain invalid entries.
   base::MessageLoop message_loop_;
   content::TestBrowserThread io_thread_;
   net::SpawnedTestServer test_server_;
   ConnectionTesterDelegate test_delegate_;
   net::MockHostResolver host_resolver_;
   scoped_ptr<net::CertVerifier> cert_verifier_;
+  scoped_ptr<net::TransportSecurityState> transport_security_state_;
   scoped_ptr<net::ProxyService> proxy_service_;
   scoped_refptr<net::SSLConfigService> ssl_config_service_;
   scoped_ptr<net::HttpTransactionFactory> http_transaction_factory_;
   net::HttpAuthHandlerRegistryFactory http_auth_handler_factory_;
   net::HttpServerPropertiesImpl http_server_properties_impl_;
   scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context_;
 
  private:
   void InitializeRequestContext() {
     proxy_script_fetcher_context_->set_host_resolver(&host_resolver_);
     cert_verifier_.reset(new net::MockCertVerifier);
+    transport_security_state_.reset(new net::TransportSecurityState);
     proxy_script_fetcher_context_->set_cert_verifier(cert_verifier_.get());
+    proxy_script_fetcher_context_->set_transport_security_state(
+        transport_security_state_.get());
     proxy_script_fetcher_context_->set_http_auth_handler_factory(
         &http_auth_handler_factory_);
     proxy_service_.reset(net::ProxyService::CreateDirect());
     proxy_script_fetcher_context_->set_proxy_service(proxy_service_.get());
     ssl_config_service_ = new net::SSLConfigServiceDefaults;
     net::HttpNetworkSession::Params session_params;
     session_params.host_resolver = &host_resolver_;
     session_params.cert_verifier = cert_verifier_.get();
+    session_params.transport_security_state = transport_security_state_.get();
     session_params.http_auth_handler_factory = &http_auth_handler_factory_;
     session_params.ssl_config_service = ssl_config_service_.get();
     session_params.proxy_service = proxy_service_.get();
     session_params.http_server_properties = &http_server_properties_impl_;
     scoped_refptr<net::HttpNetworkSession> network_session(
         new net::HttpNetworkSession(session_params));
     http_transaction_factory_.reset(
         new net::HttpNetworkLayer(network_session.get()));
     proxy_script_fetcher_context_->set_http_transaction_factory(
         http_transaction_factory_.get());
@@ skipping 60 matching lines @@
   // net::ClientSocketPoolBaseHelper, since the "Group" holds a pointer
   // |backup_task| that it will try to deref during the destructor, but
   // depending on the order that pending tasks were deleted in, it might
   // already be invalid! See http://crbug.com/43291.
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace