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 a3da86cfbb76e71f950fe687acfb4650faf685f1..d45ef0dfb913a5a66ed5367f6b4f293e7dd83a60 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/host_content_settings_map.h" |
#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" |
@@ -63,6 +65,7 @@ |
#include "content/public/browser/notification_service.h" |
#include "content/public/browser/resource_context.h" |
#include "net/base/keygen_handler.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" |
@@ -1106,6 +1109,23 @@ 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( |
Ryan Sleevi
2015/06/29 11:58:13
XXX
Eran Messeri
2015/07/10 13:15:48
Confirm wiring of main_request_context_ IIRC.
|
+ 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()); |
@@ -1253,6 +1273,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_->StopNotifications(); |
Ryan Sleevi
2015/06/29 11:58:13
XXX
Eran Messeri
2015/07/10 13:15:48
To be confirmed with davidben/mmenke (also in the
|
} |
scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory( |