| Index: components/ssl_config/ssl_config_service_manager_pref.cc
|
| diff --git a/components/ssl_config/ssl_config_service_manager_pref.cc b/components/ssl_config/ssl_config_service_manager_pref.cc
|
| index 94d2f8d37089f963ee1682445398c43d1550009c..a870ab12a0c4aaf1ca708e6c6fe05656a788963c 100644
|
| --- a/components/ssl_config/ssl_config_service_manager_pref.cc
|
| +++ b/components/ssl_config/ssl_config_service_manager_pref.cc
|
| @@ -85,10 +85,6 @@ uint16_t SSLProtocolVersionFromString(const std::string& version_str) {
|
| return version;
|
| }
|
|
|
| -const base::Feature kDHECiphersFeature{
|
| - "DHECiphers", base::FEATURE_DISABLED_BY_DEFAULT,
|
| -};
|
| -
|
| const base::Feature kTLS13Feature{
|
| "NegotiateTLS13", base::FEATURE_DISABLED_BY_DEFAULT,
|
| };
|
| @@ -198,14 +194,6 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
|
| io_task_runner_(io_task_runner) {
|
| DCHECK(local_state);
|
|
|
| - // Restore DHE-based ciphers if enabled via features.
|
| - // TODO(davidben): Remove this when the removal has succeeded.
|
| - // https://crbug.com/619194.
|
| - if (base::FeatureList::IsEnabled(kDHECiphersFeature)) {
|
| - local_state->SetDefaultPrefValue(ssl_config::prefs::kDHEEnabled,
|
| - new base::FundamentalValue(true));
|
| - }
|
| -
|
| if (base::FeatureList::IsEnabled(kTLS13Feature)) {
|
| local_state->SetDefaultPrefValue(
|
| ssl_config::prefs::kSSLVersionMax,
|
|
|