| Index: chrome/browser/net/ssl_config_service_manager_pref.cc
|
| diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc
|
| index 883d7cbbd83003bb0d1d0b994e50abb0dd6dc26f..7386d49284142b80823472bc58facf1ada5dfaab 100644
|
| --- a/chrome/browser/net/ssl_config_service_manager_pref.cc
|
| +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc
|
| @@ -139,7 +139,7 @@ class SSLConfigServiceManagerPref
|
| BooleanPrefMember rev_checking_enabled_;
|
| BooleanPrefMember ssl3_enabled_;
|
| BooleanPrefMember tls1_enabled_;
|
| - BooleanPrefMember origin_bound_certs_enabled_;
|
| + BooleanPrefMember domain_bound_certs_enabled_;
|
| BooleanPrefMember ssl_record_splitting_disabled_;
|
|
|
| // The cached list of disabled SSL cipher suites.
|
| @@ -159,7 +159,7 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
|
| local_state, this);
|
| ssl3_enabled_.Init(prefs::kSSL3Enabled, local_state, this);
|
| tls1_enabled_.Init(prefs::kTLS1Enabled, local_state, this);
|
| - origin_bound_certs_enabled_.Init(prefs::kEnableOriginBoundCerts,
|
| + domain_bound_certs_enabled_.Init(prefs::kEnableOriginBoundCerts,
|
| local_state, this);
|
| ssl_record_splitting_disabled_.Init(prefs::kDisableSSLRecordSplitting,
|
| local_state, this);
|
| @@ -182,7 +182,7 @@ void SSLConfigServiceManagerPref::RegisterPrefs(PrefService* prefs) {
|
| prefs->RegisterBooleanPref(prefs::kTLS1Enabled,
|
| default_config.tls1_enabled);
|
| prefs->RegisterBooleanPref(prefs::kEnableOriginBoundCerts,
|
| - default_config.origin_bound_certs_enabled);
|
| + default_config.domain_bound_certs_enabled);
|
| prefs->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting,
|
| !default_config.false_start_enabled);
|
| prefs->RegisterListPref(prefs::kCipherSuiteBlacklist);
|
| @@ -230,7 +230,7 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
|
| config->ssl3_enabled = ssl3_enabled_.GetValue();
|
| config->tls1_enabled = tls1_enabled_.GetValue();
|
| config->disabled_cipher_suites = disabled_cipher_suites_;
|
| - config->origin_bound_certs_enabled = origin_bound_certs_enabled_.GetValue();
|
| + config->domain_bound_certs_enabled = domain_bound_certs_enabled_.GetValue();
|
| // disabling False Start also happens to disable record splitting.
|
| config->false_start_enabled = !ssl_record_splitting_disabled_.GetValue();
|
| SSLConfigServicePref::SetSSLConfigFlags(config);
|
|
|