Revert: Revert "net: remove DNS certificate checking code."

Now with ChromeOS fix.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114664 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 3 insertions, 14 deletions

diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 8d79918..78b0eaf 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -46,7 +46,6 @@ HttpNetworkSession* CreateNetworkSession(
     CertVerifier* cert_verifier,
     OriginBoundCertService* origin_bound_cert_service,
     TransportSecurityState* transport_security_state,
-    DnsCertProvenanceChecker* dns_cert_checker,
     ProxyService* proxy_service,
     SSLHostInfoFactory* ssl_host_info_factory,
     const std::string& ssl_session_cache_shard,
@@ -60,7 +59,6 @@ HttpNetworkSession* CreateNetworkSession(
   params.cert_verifier = cert_verifier;
   params.origin_bound_cert_service = origin_bound_cert_service;
   params.transport_security_state = transport_security_state;
-  params.dns_cert_checker = dns_cert_checker;
   params.proxy_service = proxy_service;
   params.ssl_host_info_factory = ssl_host_info_factory;
   params.ssl_session_cache_shard = ssl_session_cache_shard;
@@ -321,7 +319,6 @@ HttpCache::HttpCache(HostResolver* host_resolver,
                      CertVerifier* cert_verifier,
                      OriginBoundCertService* origin_bound_cert_service,
                      TransportSecurityState* transport_security_state,
-                     DnsCertProvenanceChecker* dns_cert_checker_,
                      ProxyService* proxy_service,
                      const std::string& ssl_session_cache_shard,
                      SSLConfigService* ssl_config_service,
@@ -344,7 +341,6 @@ HttpCache::HttpCache(HostResolver* host_resolver,
                   cert_verifier,
                   origin_bound_cert_service,
                   transport_security_state,
-                  dns_cert_checker_,
                   proxy_service,
                   ssl_host_info_factory_.get(),
                   ssl_session_cache_shard,
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 62c4668..00d5b98 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -43,7 +43,6 @@ class Entry;
 namespace net {
 
 class CertVerifier;
-class DnsCertProvenanceChecker;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpNetworkSession;
@@ -124,7 +123,6 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
             CertVerifier* cert_verifier,
             OriginBoundCertService* origin_bound_cert_service,
             TransportSecurityState* transport_security_state,
-            DnsCertProvenanceChecker* dns_cert_checker,
             ProxyService* proxy_service,
             const std::string& ssl_session_cache_shard,
             SSLConfigService* ssl_config_service,
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 1c56bc5..1a59c9f 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -41,7 +41,6 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
               params.cert_verifier,
               params.origin_bound_cert_service,
               params.transport_security_state,
-              params.dns_cert_checker,
               params.ssl_host_info_factory,
               params.ssl_session_cache_shard,
               params.proxy_service,
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 5dcf825..2ccec50 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -27,7 +27,6 @@ namespace net {
 
 class CertVerifier;
 class ClientSocketFactory;
-class DnsCertProvenanceChecker;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpNetworkSessionPeer;
@@ -57,7 +56,6 @@ class NET_EXPORT HttpNetworkSession
           cert_verifier(NULL),
           origin_bound_cert_service(NULL),
           transport_security_state(NULL),
-          dns_cert_checker(NULL),
           proxy_service(NULL),
           ssl_host_info_factory(NULL),
           ssl_config_service(NULL),
@@ -71,7 +69,6 @@ class NET_EXPORT HttpNetworkSession
     CertVerifier* cert_verifier;
     OriginBoundCertService* origin_bound_cert_service;
     TransportSecurityState* transport_security_state;
-    DnsCertProvenanceChecker* dns_cert_checker;
     ProxyService* proxy_service;
     SSLHostInfoFactory* ssl_host_info_factory;
     std::string ssl_session_cache_shard;
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index fd0a4c4..9284f76 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -370,7 +370,7 @@ template<>
 CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool(
     HostResolver* host_resolver,
     CertVerifier* cert_verifier)
-    : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL, NULL,
+    : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL,
                           NULL, NULL, "", NULL, NULL, NULL, NULL, NULL, NULL) {}
 
 //-----------------------------------------------------------------------------
diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc
index 4c589e9..0aa5ee9 100644
--- a/net/http/http_proxy_client_socket_pool_unittest.cc
+++ b/net/http/http_proxy_client_socket_pool_unittest.cc
@@ -68,8 +68,7 @@ class HttpProxyClientSocketPoolTest : public TestWithHttpParam {
                          &host_resolver_,
                          &cert_verifier_,
                          NULL /* origin_bound_cert_store */,
-                         NULL /* dnsrr_resolver */,
-                         NULL /* dns_cert_checker */,
+                         NULL /* transport_security_state */,
                          NULL /* ssl_host_info_factory */,
                          ""   /* ssl_session_cache_shard */,
                          &socket_factory_,
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index e753d28..8c463af 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -274,7 +274,7 @@ CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool(
 template<>
 CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool(
     HostResolver* host_resolver, CertVerifier* cert_verifier)
-    : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL, NULL,
+    : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL,
                           NULL, NULL, "", NULL, NULL, NULL, NULL, NULL, NULL),
       last_num_streams_(-1) {}