| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs( | 590 std::vector<scoped_refptr<const net::CTLogVerifier>> ct_logs( |
| 591 net::ct::CreateLogVerifiersForKnownLogs()); | 591 net::ct::CreateLogVerifiersForKnownLogs()); |
| 592 | 592 |
| 593 globals_->ct_logs.assign(ct_logs.begin(), ct_logs.end()); | 593 globals_->ct_logs.assign(ct_logs.begin(), ct_logs.end()); |
| 594 | 594 |
| 595 net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier(); | 595 net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier(); |
| 596 globals_->cert_transparency_verifier.reset(ct_verifier); | 596 globals_->cert_transparency_verifier.reset(ct_verifier); |
| 597 // Add built-in logs | 597 // Add built-in logs |
| 598 ct_verifier->AddLogs(globals_->ct_logs); | 598 ct_verifier->AddLogs(globals_->ct_logs); |
| 599 | 599 |
| 600 ct_tree_tracker_.reset( | 600 ct_tree_tracker_.reset(new certificate_transparency::TreeStateTracker( |
| 601 new certificate_transparency::TreeStateTracker(globals_->ct_logs)); | 601 globals_->ct_logs, net_log_)); |
| 602 // Register the ct_tree_tracker_ as observer for new STHs. | 602 // Register the ct_tree_tracker_ as observer for new STHs. |
| 603 RegisterSTHObserver(ct_tree_tracker_.get()); | 603 RegisterSTHObserver(ct_tree_tracker_.get()); |
| 604 // Register the ct_tree_tracker_ as observer for verified SCTs. | 604 // Register the ct_tree_tracker_ as observer for verified SCTs. |
| 605 globals_->cert_transparency_verifier->SetObserver(ct_tree_tracker_.get()); | 605 globals_->cert_transparency_verifier->SetObserver(ct_tree_tracker_.get()); |
| 606 | 606 |
| 607 globals_->ct_policy_enforcer.reset(new net::CTPolicyEnforcer()); | 607 globals_->ct_policy_enforcer.reset(new net::CTPolicyEnforcer()); |
| 608 params_.ct_policy_enforcer = globals_->ct_policy_enforcer.get(); | 608 params_.ct_policy_enforcer = globals_->ct_policy_enforcer.get(); |
| 609 | 609 |
| 610 globals_->ssl_config_service = GetSSLConfigService(); | 610 globals_->ssl_config_service = GetSSLConfigService(); |
| 611 | 611 |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1115 | 1115 |
| 1116 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1116 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1117 // system URLRequestContext too. There's no reason this should be tied to a | 1117 // system URLRequestContext too. There's no reason this should be tied to a |
| 1118 // profile. | 1118 // profile. |
| 1119 return context; | 1119 return context; |
| 1120 } | 1120 } |
| 1121 | 1121 |
| 1122 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { | 1122 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { |
| 1123 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); | 1123 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); |
| 1124 } | 1124 } |
| OLD | NEW |