Index: net/base/ssl_config_service.cc |
diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc |
index d02df385b93c3e088709dd1881d1f1178f9d207d..f47392d0e6cd4ee541e8e170985cfd2712ebdab0 100644 |
--- a/net/base/ssl_config_service.cc |
+++ b/net/base/ssl_config_service.cc |
@@ -43,9 +43,6 @@ SSLConfigService::SSLConfigService() |
: observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) { |
} |
-SSLConfigService::~SSLConfigService() { |
-} |
- |
// static |
SSLConfigService* SSLConfigService::CreateSystemSSLConfigService() { |
#if defined(OS_WIN) |
@@ -100,16 +97,6 @@ static bool g_snap_start_enabled = false; |
static bool g_dns_cert_provenance_checking = false; |
// static |
-void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) { |
- ssl_config->dnssec_enabled = g_dnssec_enabled; |
- ssl_config->false_start_enabled = g_false_start_enabled; |
- ssl_config->mitm_proxies_allowed = g_mitm_proxies_allowed; |
- ssl_config->snap_start_enabled = g_snap_start_enabled; |
- ssl_config->dns_cert_provenance_checking_enabled = |
- g_dns_cert_provenance_checking; |
-} |
- |
-// static |
void SSLConfigService::EnableDNSSEC() { |
g_dnssec_enabled = true; |
} |
@@ -130,23 +117,23 @@ bool SSLConfigService::snap_start_enabled() { |
} |
// static |
-void SSLConfigService::DisableFalseStart() { |
- g_false_start_enabled = false; |
+void SSLConfigService::AllowMITMProxies() { |
+ g_mitm_proxies_allowed = true; |
} |
// static |
-bool SSLConfigService::false_start_enabled() { |
- return g_false_start_enabled; |
+bool SSLConfigService::mitm_proxies_allowed() { |
+ return g_mitm_proxies_allowed; |
} |
// static |
-void SSLConfigService::AllowMITMProxies() { |
- g_mitm_proxies_allowed = true; |
+void SSLConfigService::DisableFalseStart() { |
+ g_false_start_enabled = false; |
} |
// static |
-bool SSLConfigService::mitm_proxies_allowed() { |
- return g_mitm_proxies_allowed; |
+bool SSLConfigService::false_start_enabled() { |
+ return g_false_start_enabled; |
} |
// static |
@@ -167,6 +154,19 @@ void SSLConfigService::RemoveObserver(Observer* observer) { |
observer_list_.RemoveObserver(observer); |
} |
+SSLConfigService::~SSLConfigService() { |
+} |
+ |
+// static |
+void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) { |
+ ssl_config->dnssec_enabled = g_dnssec_enabled; |
+ ssl_config->false_start_enabled = g_false_start_enabled; |
+ ssl_config->mitm_proxies_allowed = g_mitm_proxies_allowed; |
+ ssl_config->snap_start_enabled = g_snap_start_enabled; |
+ ssl_config->dns_cert_provenance_checking_enabled = |
+ g_dns_cert_provenance_checking; |
+} |
+ |
void SSLConfigService::ProcessConfigUpdate(const SSLConfig& orig_config, |
const SSLConfig& new_config) { |
if (orig_config.rev_checking_enabled != new_config.rev_checking_enabled || |