Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Side by Side Diff: chrome/browser/io_thread.cc

Issue 795013003: Certificate Transparency: Remove SSLWatcher's Alpha log. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | net/cert/cert_policy_enforcer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <vector> 7 #include <vector>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 net::CTLogVerifier::Create(ct_public_key_data, log_description)); 651 net::CTLogVerifier::Create(ct_public_key_data, log_description));
652 CHECK(external_log_verifier) << "Unable to parse CT public key."; 652 CHECK(external_log_verifier) << "Unable to parse CT public key.";
653 VLOG(1) << "Adding log with description " << log_description; 653 VLOG(1) << "Adding log with description " << log_description;
654 ct_verifier->AddLog(external_log_verifier.Pass()); 654 ct_verifier->AddLog(external_log_verifier.Pass());
655 } 655 }
656 } 656 }
657 657
658 net::CertPolicyEnforcer* policy_enforcer = NULL; 658 net::CertPolicyEnforcer* policy_enforcer = NULL;
659 // TODO(eranm): Control with Finch, crbug.com/437766 659 // TODO(eranm): Control with Finch, crbug.com/437766
660 if (command_line.HasSwitch(switches::kRequireCTForEV)) { 660 if (command_line.HasSwitch(switches::kRequireCTForEV)) {
661 policy_enforcer = new net::CertPolicyEnforcer(kNumKnownCTLogs, true); 661 policy_enforcer = new net::CertPolicyEnforcer(true);
662 } else { 662 } else {
663 policy_enforcer = new net::CertPolicyEnforcer(kNumKnownCTLogs, false); 663 policy_enforcer = new net::CertPolicyEnforcer(false);
664 } 664 }
665 globals_->cert_policy_enforcer.reset(policy_enforcer); 665 globals_->cert_policy_enforcer.reset(policy_enforcer);
666 666
667 globals_->ssl_config_service = GetSSLConfigService(); 667 globals_->ssl_config_service = GetSSLConfigService();
668 668
669 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( 669 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory(
670 globals_->host_resolver.get())); 670 globals_->host_resolver.get()));
671 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl()); 671 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl());
672 // For the ProxyScriptFetcher, we use a direct ProxyService. 672 // For the ProxyScriptFetcher, we use a direct ProxyService.
673 globals_->proxy_script_fetcher_proxy_service.reset( 673 globals_->proxy_script_fetcher_proxy_service.reset(
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); 1407 net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
1408 for (size_t i = 0; i < supported_versions.size(); ++i) { 1408 for (size_t i = 0; i < supported_versions.size(); ++i) {
1409 net::QuicVersion version = supported_versions[i]; 1409 net::QuicVersion version = supported_versions[i];
1410 if (net::QuicVersionToString(version) == quic_version) { 1410 if (net::QuicVersionToString(version) == quic_version) {
1411 return version; 1411 return version;
1412 } 1412 }
1413 } 1413 }
1414 1414
1415 return net::QUIC_VERSION_UNSUPPORTED; 1415 return net::QUIC_VERSION_UNSUPPORTED;
1416 } 1416 }
OLDNEW
« no previous file with comments | « no previous file | net/cert/cert_policy_enforcer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698