Add RecordType TLS 1.3 variant.

Bug: 
Change-Id: I471ccb0aa6ce7145a3498f49ec8c12bc93314215
Reviewed-on: https://chromium-review.googlesource.com/571325Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Steven Valdez <svaldez@chromium.org>
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487274}

chrome/browser/about_flags.cc

@@ -771,6 +771,8 @@ const FeatureEntry::Choice kTLS13VariantChoices[] = {
      switches::kTLS13VariantDraft},
     {flag_descriptions::kTLS13VariantExperiment, switches::kTLS13Variant,
      switches::kTLS13VariantExperiment},
+    {flag_descriptions::kTLS13VariantRecordTypeExperiment,
+     switches::kTLS13Variant, switches::kTLS13VariantRecordTypeExperiment},
 };
 
 #if !defined(OS_ANDROID)

chrome/browser/flag_descriptions.cc

@@ -1180,6 +1180,8 @@ const char kTLS13VariantDescription[] = "Sets the TLS 1.3 variant used.";
 const char kTLS13VariantDisabled[] = "Disabled";
 const char kTLS13VariantDraft[] = "Enabled (Draft)";
 const char kTLS13VariantExperiment[] = "Enabled (Experiment)";
+const char kTLS13VariantRecordTypeExperiment[] =
+    "Enabled (Record Type Experiment)";
 
 const char kTopDocumentIsolationName[] = "Top document isolation";
 const char kTopDocumentIsolationDescription[] =

chrome/browser/flag_descriptions.h

@@ -707,6 +707,7 @@ extern const char kTLS13VariantDescription[];
 extern const char kTLS13VariantDisabled[];
 extern const char kTLS13VariantDraft[];
 extern const char kTLS13VariantExperiment[];
+extern const char kTLS13VariantRecordTypeExperiment[];
 
 extern const char kSuggestionsWithSubStringMatchName[];
 extern const char kSuggestionsWithSubStringMatchDescription[];

components/ssl_config/ssl_config_service_manager_pref.cc

@@ -213,6 +213,13 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
     local_state->SetDefaultPrefValue(
         ssl_config::prefs::kSSLVersionMax,
         new base::Value(switches::kSSLVersionTLSv13));
+  } else if (tls13_variant == "record-type") {
+    local_state->SetDefaultPrefValue(
+        ssl_config::prefs::kTLS13Variant,
+        new base::Value(switches::kTLS13VariantRecordTypeExperiment));
+    local_state->SetDefaultPrefValue(
+        ssl_config::prefs::kSSLVersionMax,
+        new base::Value(switches::kSSLVersionTLSv13));
   }
 
   PrefChangeRegistrar::NamedChangeCallback local_state_callback =

components/ssl_config/ssl_config_switches.cc

@@ -27,5 +27,6 @@ const char kSSLVersionTLSv13[] = "tls1.3";
 const char kTLS13VariantDisabled[] = "disabled";
 const char kTLS13VariantDraft[] = "draft";
 const char kTLS13VariantExperiment[] = "experiment";
+const char kTLS13VariantRecordTypeExperiment[] = "record-type";
 
 }  // namespace switches

components/ssl_config/ssl_config_switches.h

@@ -17,6 +17,7 @@ extern const char kSSLVersionTLSv13[];
 extern const char kTLS13VariantDisabled[];
 extern const char kTLS13VariantDraft[];
 extern const char kTLS13VariantExperiment[];
+extern const char kTLS13VariantRecordTypeExperiment[];
 
 }  // namespace switches
 

net/socket/ssl_client_socket_impl.cc

@@ -928,6 +928,9 @@ int SSLClientSocketImpl::Init() {
     case kTLS13VariantExperiment:
       SSL_set_tls13_variant(ssl_.get(), tls13_experiment);
       break;
+    case kTLS13VariantRecordTypeExperiment:
+      SSL_set_tls13_variant(ssl_.get(), tls13_record_type_experiment);
+      break;
   }
 
   // OpenSSL defaults some options to on, others to off. To avoid ambiguity,

net/ssl/ssl_config.h

@@ -38,6 +38,7 @@ enum TokenBindingParam {
 enum TLS13Variant {
   kTLS13VariantDraft = 0,
   kTLS13VariantExperiment = 1,
+  kTLS13VariantRecordTypeExperiment = 2,
 };
 
 // Default minimum protocol version.