Require a CTVerifier and CTPolicyEnforcer for TLS/QUIC sockets

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_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/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.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"
@@ skipping 17 matching lines @@
 const int kStageCompletedSuccess = 1 << 7;
 const int kStageCompletedError = 1 << 8;
 const int kStageURLRequestDestroyed = 1 << 9;
 const int kStageDestruction = 1 << 10;
 
 }  // namespace
 
 TestURLRequestContext::TestURLRequestContext() : TestURLRequestContext(false) {}
 
 TestURLRequestContext::TestURLRequestContext(bool delay_initialization)
-    : initialized_(false),
-      client_socket_factory_(nullptr),
-      proxy_delegate_(nullptr),
-      ct_policy_enforcer_(nullptr),
-      context_storage_(this) {
+    : context_storage_(this) {
   if (!delay_initialization)
     Init();
 }
 
 TestURLRequestContext::~TestURLRequestContext() {
   DCHECK(initialized_);
   AssertNoURLRequests();
 }
 
 void TestURLRequestContext::Init() {
   DCHECK(!initialized_);
   initialized_ = true;
 
   if (!host_resolver())
     context_storage_.set_host_resolver(
         std::unique_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(
         base::WrapUnique(new TransportSecurityState()));
+  if (!cert_transparency_verifier())
+    context_storage_.set_cert_transparency_verifier(
+        base::WrapUnique(new MultiLogCTVerifier()));

[Ryan Hamilton, 2016/06/16 03:31:04]

Since the if body is more than one line, should these have {}s (Like on line
91... but unlike the others? *boggle*

+  if (!ct_policy_enforcer())
+    context_storage_.set_ct_policy_enforcer(
+        base::WrapUnique(new CTPolicyEnforcer));
   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(
         std::unique_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
   }
@@ skipping 15 matching lines @@
   } else {
     HttpNetworkSession::Params params;
 
     if (http_network_session_params_)
       params = *http_network_session_params_;
     params.client_socket_factory = client_socket_factory();
     params.proxy_delegate = proxy_delegate();
     params.host_resolver = host_resolver();
     params.cert_verifier = cert_verifier();
     params.cert_transparency_verifier = cert_transparency_verifier();
-    if (ct_policy_enforcer())
-      params.ct_policy_enforcer = ct_policy_enforcer();
+    params.ct_policy_enforcer = ct_policy_enforcer();
     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.http_server_properties = http_server_properties();
     params.net_log = net_log();
     params.channel_id_service = channel_id_service();
     context_storage_.set_http_network_session(
         base::WrapUnique(new HttpNetworkSession(params)));
     context_storage_.set_http_transaction_factory(base::WrapUnique(
@@ skipping 523 matching lines @@
     NetworkDelegate* network_delegate) const {
   return main_intercept_job_.release();
 }
 
 void TestJobInterceptor::set_main_intercept_job(
     std::unique_ptr<URLRequestJob> job) {
   main_intercept_job_ = std::move(job);
 }
 
 }  // namespace net