From 3ed7496fcf01af71b591fa3ced274cfbdad78c9f Mon Sep 17 00:00:00 2001
From: "agl@chromium.org"
 <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 15 Dec 2011 18:27:40 +0000
Subject: 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
---
 net/url_request/url_request_context.cc         | 2 --
 net/url_request/url_request_context.h          | 9 ---------
 net/url_request/url_request_context_storage.cc | 7 -------
 net/url_request/url_request_context_storage.h  | 3 ---
 4 files changed, 21 deletions(-)

(limited to 'net/url_request')

diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index 142068e..13a1b0d 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -19,7 +19,6 @@ URLRequestContext::URLRequestContext()
       host_resolver_(NULL),
       cert_verifier_(NULL),
       origin_bound_cert_service_(NULL),
-      dns_cert_checker_(NULL),
       fraudulent_certificate_reporter_(NULL),
       http_auth_handler_factory_(NULL),
       proxy_service_(NULL),
@@ -38,7 +37,6 @@ void URLRequestContext::CopyFrom(URLRequestContext* other) {
   set_host_resolver(other->host_resolver());
   set_cert_verifier(other->cert_verifier());
   set_origin_bound_cert_service(other->origin_bound_cert_service());
-  set_dns_cert_checker(other->dns_cert_checker());
   set_fraudulent_certificate_reporter(other->fraudulent_certificate_reporter());
   set_http_auth_handler_factory(other->http_auth_handler_factory());
   set_proxy_service(other->proxy_service());
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index b3ccd3b..7d9d2e6 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -25,7 +25,6 @@
 namespace net {
 class CertVerifier;
 class CookieStore;
-class DnsCertProvenanceChecker;
 class FraudulentCertificateReporter;
 class FtpTransactionFactory;
 class HostResolver;
@@ -87,13 +86,6 @@ class NET_EXPORT URLRequestContext
     origin_bound_cert_service_ = origin_bound_cert_service;
   }
 
-  DnsCertProvenanceChecker* dns_cert_checker() const {
-    return dns_cert_checker_;
-  }
-  void set_dns_cert_checker(DnsCertProvenanceChecker* dns_cert_checker) {
-    dns_cert_checker_ = dns_cert_checker;
-  }
-
   FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
     return fraudulent_certificate_reporter_;
   }
@@ -216,7 +208,6 @@ class NET_EXPORT URLRequestContext
   HostResolver* host_resolver_;
   CertVerifier* cert_verifier_;
   OriginBoundCertService* origin_bound_cert_service_;
-  DnsCertProvenanceChecker* dns_cert_checker_;
   FraudulentCertificateReporter* fraudulent_certificate_reporter_;
   HttpAuthHandlerFactory* http_auth_handler_factory_;
   ProxyService* proxy_service_;
diff --git a/net/url_request/url_request_context_storage.cc b/net/url_request/url_request_context_storage.cc
index 4f0a2b0..cb29c1b 100644
--- a/net/url_request/url_request_context_storage.cc
+++ b/net/url_request/url_request_context_storage.cc
@@ -16,7 +16,6 @@
 #include "net/http/http_server_properties.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/proxy/proxy_service.h"
-#include "net/socket/dns_cert_provenance_checker.h"
 #include "net/url_request/fraudulent_certificate_reporter.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
@@ -51,12 +50,6 @@ void URLRequestContextStorage::set_origin_bound_cert_service(
   origin_bound_cert_service_.reset(origin_bound_cert_service);
 }
 
-void URLRequestContextStorage::set_dns_cert_checker(
-    DnsCertProvenanceChecker* dns_cert_checker) {
-  context_->set_dns_cert_checker(dns_cert_checker);
-  dns_cert_checker_.reset(dns_cert_checker);
-}
-
 void URLRequestContextStorage::set_fraudulent_certificate_reporter(
     FraudulentCertificateReporter* fraudulent_certificate_reporter) {
   context_->set_fraudulent_certificate_reporter(
diff --git a/net/url_request/url_request_context_storage.h b/net/url_request/url_request_context_storage.h
index 4a2df3d..8ae2a00 100644
--- a/net/url_request/url_request_context_storage.h
+++ b/net/url_request/url_request_context_storage.h
@@ -15,7 +15,6 @@ namespace net {
 
 class CertVerifier;
 class CookieStore;
-class DnsCertProvenanceChecker;
 class FraudulentCertificateReporter;
 class FtpTransactionFactory;
 class HostResolver;
@@ -49,7 +48,6 @@ class NET_EXPORT URLRequestContextStorage {
   void set_cert_verifier(CertVerifier* cert_verifier);
   void set_origin_bound_cert_service(
       OriginBoundCertService* origin_bound_cert_service);
-  void set_dns_cert_checker(DnsCertProvenanceChecker* dns_cert_checker);
   void set_fraudulent_certificate_reporter(
       FraudulentCertificateReporter* fraudulent_certificate_reporter);
   void set_http_auth_handler_factory(
@@ -78,7 +76,6 @@ class NET_EXPORT URLRequestContextStorage {
   scoped_ptr<HostResolver> host_resolver_;
   scoped_ptr<CertVerifier> cert_verifier_;
   scoped_ptr<OriginBoundCertService> origin_bound_cert_service_;
-  scoped_ptr<DnsCertProvenanceChecker> dns_cert_checker_;
   scoped_ptr<FraudulentCertificateReporter> fraudulent_certificate_reporter_;
   scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory_;
   scoped_ptr<ProxyService> proxy_service_;
-- 
cgit v1.1