net: replace DnsRRResoler with TransportSecurityState in plumbing.

The DnsRRResoler has served its time and I don't have any further plans for it.

The TransportSecurityState will be used (in a future CL) to enforce public key
pinning at certificate verification time. Currently we only enforce it in
url_request_http_job.cc which means that we've already sent the HTTP request
(inc cookies) by the time we catch the problem. This was expeditious while we
fixed some other issues, but it's time to fix it.

BUG=none
TEST=compiles


Review URL: http://codereview.chromium.org/8692012

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

5 files changed, 12 insertions, 11 deletions

diff --git a/net/http/disk_cache_based_ssl_host_info_unittest.cc b/net/http/disk_cache_based_ssl_host_info_unittest.cc
index 3e84d47..9fb4727 100644
--- a/net/http/disk_cache_based_ssl_host_info_unittest.cc
+++ b/net/http/disk_cache_based_ssl_host_info_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
+#include "base/message_loop.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
 #include "net/http/disk_cache_based_ssl_host_info.h"
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index 58fa5cb..4aa37fa 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -45,7 +45,7 @@ HttpNetworkSession* CreateNetworkSession(
     HostResolver* host_resolver,
     CertVerifier* cert_verifier,
     OriginBoundCertService* origin_bound_cert_service,
-    DnsRRResolver* dnsrr_resolver,
+    TransportSecurityState* transport_security_state,
     DnsCertProvenanceChecker* dns_cert_checker,
     ProxyService* proxy_service,
     SSLHostInfoFactory* ssl_host_info_factory,
@@ -58,7 +58,7 @@ HttpNetworkSession* CreateNetworkSession(
   params.host_resolver = host_resolver;
   params.cert_verifier = cert_verifier;
   params.origin_bound_cert_service = origin_bound_cert_service;
-  params.dnsrr_resolver = dnsrr_resolver;
+  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;
@@ -318,7 +318,7 @@ class HttpCache::SSLHostInfoFactoryAdaptor : public SSLHostInfoFactory {
 HttpCache::HttpCache(HostResolver* host_resolver,
                      CertVerifier* cert_verifier,
                      OriginBoundCertService* origin_bound_cert_service,
-                     DnsRRResolver* dnsrr_resolver,
+                     TransportSecurityState* transport_security_state,
                      DnsCertProvenanceChecker* dns_cert_checker_,
                      ProxyService* proxy_service,
                      SSLConfigService* ssl_config_service,
@@ -340,7 +340,7 @@ HttpCache::HttpCache(HostResolver* host_resolver,
                   host_resolver,
                   cert_verifier,
                   origin_bound_cert_service,
-                  dnsrr_resolver,
+                  transport_security_state,
                   dns_cert_checker_,
                   proxy_service,
                   ssl_host_info_factory_.get(),
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 526da58..0e12443 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -44,11 +44,9 @@ namespace net {
 
 class CertVerifier;
 class DnsCertProvenanceChecker;
-class DnsRRResolver;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpNetworkSession;
-struct HttpRequestInfo;
 class HttpResponseInfo;
 class HttpServerProperties;
 class IOBuffer;
@@ -57,7 +55,9 @@ class NetworkDelegate;
 class OriginBoundCertService;
 class ProxyService;
 class SSLConfigService;
+class TransportSecurityState;
 class ViewCacheHelper;
+struct HttpRequestInfo;
 
 class NET_EXPORT HttpCache : public HttpTransactionFactory,
                              public base::SupportsWeakPtr<HttpCache>,
@@ -123,7 +123,7 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
   HttpCache(HostResolver* host_resolver,
             CertVerifier* cert_verifier,
             OriginBoundCertService* origin_bound_cert_service,
-            DnsRRResolver* dnsrr_resolver,
+            TransportSecurityState* transport_security_state,
             DnsCertProvenanceChecker* dns_cert_checker,
             ProxyService* proxy_service,
             SSLConfigService* ssl_config_service,
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index ffdaee5..cc3fdd1f 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -40,7 +40,7 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
               params.host_resolver,
               params.cert_verifier,
               params.origin_bound_cert_service,
-              params.dnsrr_resolver,
+              params.transport_security_state,
               params.dns_cert_checker,
               params.ssl_host_info_factory,
               params.proxy_service,
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index a6c6912..083d807 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -28,7 +28,6 @@ namespace net {
 class CertVerifier;
 class ClientSocketFactory;
 class DnsCertProvenanceChecker;
-class DnsRRResolver;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpNetworkSessionPeer;
@@ -44,6 +43,7 @@ class SSLClientSocketPool;
 class SSLConfigService;
 class SSLHostInfoFactory;
 class TransportClientSocketPool;
+class TransportSecurityState;
 
 // This class holds session objects used by HttpNetworkTransaction objects.
 class NET_EXPORT HttpNetworkSession
@@ -56,7 +56,7 @@ class NET_EXPORT HttpNetworkSession
           host_resolver(NULL),
           cert_verifier(NULL),
           origin_bound_cert_service(NULL),
-          dnsrr_resolver(NULL),
+          transport_security_state(NULL),
           dns_cert_checker(NULL),
           proxy_service(NULL),
           ssl_host_info_factory(NULL),
@@ -70,7 +70,7 @@ class NET_EXPORT HttpNetworkSession
     HostResolver* host_resolver;
     CertVerifier* cert_verifier;
     OriginBoundCertService* origin_bound_cert_service;
-    DnsRRResolver* dnsrr_resolver;
+    TransportSecurityState* transport_security_state;
     DnsCertProvenanceChecker* dns_cert_checker;
     ProxyService* proxy_service;
     SSLHostInfoFactory* ssl_host_info_factory;