Index: chrome/browser/profiles/profile_io_data.cc |
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
index b8db2b3dba581c82a5f3ca06bfe3b16911fee276..e7762dd1edb28a1fc0ddcf57a1689220c31b4224 100644 |
--- a/chrome/browser/profiles/profile_io_data.cc |
+++ b/chrome/browser/profiles/profile_io_data.cc |
@@ -52,6 +52,8 @@ |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/common/url_constants.h" |
+#include "components/certificate_transparency/log_proof_fetcher.h" |
+#include "components/certificate_transparency/tree_state_tracker.h" |
#include "components/content_settings/core/browser/content_settings_provider.h" |
#include "components/content_settings/core/browser/cookie_settings.h" |
#include "components/content_settings/core/browser/host_content_settings_map.h" |
@@ -65,6 +67,7 @@ |
#include "content/public/browser/resource_context.h" |
#include "net/base/keygen_handler.h" |
#include "net/cert/cert_verifier.h" |
+#include "net/cert/multi_log_ct_verifier.h" |
#include "net/cookies/canonical_cookie.h" |
#include "net/http/http_transaction_factory.h" |
#include "net/http/http_util.h" |
@@ -1140,6 +1143,24 @@ void ProfileIOData::Init( |
profile_params_->new_tab_page_interceptor.release()); |
} |
+ net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier(); |
+ ct_verifier->AddLogs(io_thread_globals->ct_logs); |
+ main_request_context_->set_cert_transparency_verifier(ct_verifier); |
+ |
+ VLOG(1) << "Creating TreeStateTracker observer on ProfileIOData."; |
+ certificate_transparency::TreeStateTracker* scts_observer( |
+ new certificate_transparency::TreeStateTracker( |
+ scoped_ptr<certificate_transparency::LogProofFetcher>( |
+ new certificate_transparency::LogProofFetcher( |
+ main_request_context_.get())) |
+ .Pass(), |
+ io_thread_globals->ct_logs)); |
+ ct_verifier->SetObserver(scts_observer); |
+ |
+ cert_transparency_verifier_.reset(ct_verifier); |
+ cert_transparency_observer_.reset(scts_observer); |
+ VLOG(1) << "TreeStateTracker observer on ProfileIOData created."; |
+ |
InitializeInternal( |
network_delegate.Pass(), profile_params_.get(), |
protocol_handlers, request_interceptors.Pass()); |
@@ -1287,6 +1308,9 @@ void ProfileIOData::set_channel_id_service( |
void ProfileIOData::DestroyResourceContext() { |
resource_context_.reset(); |
+ // Stop any new URLRequests from being made by the cert_transparency_observer_ |
+ // by stopping notifications to it from the CTVerifier. |
+ cert_transparency_verifier_->SetObserver(nullptr); |
} |
scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory( |