Revert 105675 - Revert 105669 - Additional infrastructure code supporting the report fraudulent certificate chains feature.

BUG=99185
Review URL: http://codereview.chromium.org/8055027

TBR=palmer@chromium.org
Review URL: http://codereview.chromium.org/8311002

TBR=lipalani@chromium.org
Review URL: http://codereview.chromium.org/8308006

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

4 files changed, 17 insertions, 0 deletions

diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc
index cf3d126..ca50761 100644
--- a/chrome/browser/profiles/off_the_record_profile_io_data.cc
+++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc
@@ -164,6 +164,8 @@ void OffTheRecordProfileIOData::LazyInitializeInternal(
   main_context->set_http_auth_handler_factory(
       io_thread_globals->http_auth_handler_factory.get());
   main_context->set_dns_cert_checker(dns_cert_checker());
+  main_context->set_fraudulent_certificate_reporter(
+      fraudulent_certificate_reporter());
   main_context->set_proxy_service(proxy_service());
 
   // For incognito, we use the default non-persistent HttpServerPropertiesImpl.
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index 591d77e..d6ef5ec 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -291,7 +291,11 @@ void ProfileImplIOData::LazyInitializeInternal(
       io_thread_globals->http_auth_handler_factory.get());
 
   main_context->set_dns_cert_checker(dns_cert_checker());
+  main_context->set_fraudulent_certificate_reporter(
+      fraudulent_certificate_reporter());
   media_request_context_->set_dns_cert_checker(dns_cert_checker());
+  media_request_context_->set_fraudulent_certificate_reporter(
+      fraudulent_certificate_reporter());
 
   main_context->set_proxy_service(proxy_service());
   media_request_context_->set_proxy_service(proxy_service());
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 24dd15a..95af1dd 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/media/media_internals.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/net/chrome_dns_cert_provenance_checker_factory.h"
+#include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
@@ -413,6 +414,9 @@ void ProfileIOData::LazyInitialize() const {
   dns_cert_checker_.reset(
       CreateDnsCertProvenanceChecker(io_thread_globals->dnsrr_resolver.get(),
                                      main_request_context_));
+  fraudulent_certificate_reporter_.reset(
+      new chrome_browser_net::ChromeFraudulentCertificateReporter(
+          main_request_context_));
 
   proxy_service_.reset(
       ProxyServiceFactory::CreateProxyService(
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index da4e2b5..9787647 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -43,6 +43,7 @@ class MediaStreamManager;
 namespace net {
 class CookieStore;
 class DnsCertProvenanceChecker;
+class FraudulentCertificateReporter;
 class HttpTransactionFactory;
 class NetLog;
 class OriginBoundCertService;
@@ -205,6 +206,10 @@ class ProfileIOData {
     return dns_cert_checker_.get();
   }
 
+  net::FraudulentCertificateReporter* fraudulent_certificate_reporter() const {
+    return fraudulent_certificate_reporter_.get();
+  }
+
   net::ProxyService* proxy_service() const {
     return proxy_service_.get();
   }
@@ -276,6 +281,8 @@ class ProfileIOData {
   mutable scoped_ptr<net::OriginBoundCertService> origin_bound_cert_service_;
   mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
   mutable scoped_ptr<net::DnsCertProvenanceChecker> dns_cert_checker_;
+  mutable scoped_ptr<net::FraudulentCertificateReporter>
+      fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
   mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;