| 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 af1cd0939297658a92c2a2266974f36fdc10e9ca..fe1e2434cbecbf6b06958c24c3431c80f6d118ae 100644
|
| --- a/components/ssl_config/ssl_config_service_manager_pref.cc
|
| +++ b/components/ssl_config/ssl_config_service_manager_pref.cc
|
| @@ -11,8 +11,8 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/feature_list.h"
|
| +#include "base/location.h"
|
| #include "base/macros.h"
|
| -#include "base/metrics/field_trial.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/values.h"
|
| @@ -83,12 +83,6 @@ uint16_t SSLProtocolVersionFromString(const std::string& version_str) {
|
| return version;
|
| }
|
|
|
| -bool IsRC4EnabledByDefault() {
|
| - const std::string group_name =
|
| - base::FieldTrialList::FindFullName("RC4Ciphers");
|
| - return base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
|
| -}
|
| -
|
| const base::Feature kSSLVersionFallbackTLSv11 {
|
| "SSLVersionFallbackTLSv1.1", base::FEATURE_DISABLED_BY_DEFAULT,
|
| };
|
| @@ -198,10 +192,6 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
|
| io_task_runner_(io_task_runner) {
|
| DCHECK(local_state);
|
|
|
| - local_state->SetDefaultPrefValue(
|
| - ssl_config::prefs::kRC4Enabled,
|
| - new base::FundamentalValue(IsRC4EnabledByDefault()));
|
| -
|
| // Restore the TLS 1.1 fallback leg if enabled via features.
|
| // TODO(davidben): Remove this when the fallback removal has succeeded.
|
| // https://crbug.com/536200.
|
|
|