Add no session_id TLS 1.3 variant.

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

chrome/browser/about_flags.cc

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

chrome/browser/flag_descriptions.cc

@@ -1193,6 +1193,8 @@ const char kTLS13VariantDraft[] = "Enabled (Draft)";
 const char kTLS13VariantExperiment[] = "Enabled (Experiment)";
 const char kTLS13VariantRecordTypeExperiment[] =
     "Enabled (Record Type Experiment)";
+const char kTLS13VariantNoSessionIDExperiment[] =
+    "Enabled (No Session ID Experiment)";
 
 const char kTopDocumentIsolationName[] = "Top document isolation";
 const char kTopDocumentIsolationDescription[] =

chrome/browser/flag_descriptions.h

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

components/ssl_config/ssl_config_service_manager_pref.cc

@@ -220,6 +220,13 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
     local_state->SetDefaultPrefValue(
         ssl_config::prefs::kSSLVersionMax,
         new base::Value(switches::kSSLVersionTLSv13));
+  } else if (tls13_variant == "no-session-id") {
+    local_state->SetDefaultPrefValue(
+        ssl_config::prefs::kTLS13Variant,
+        new base::Value(switches::kTLS13VariantNoSessionIDExperiment));
+    local_state->SetDefaultPrefValue(
+        ssl_config::prefs::kSSLVersionMax,
+        new base::Value(switches::kSSLVersionTLSv13));
   }
 
   PrefChangeRegistrar::NamedChangeCallback local_state_callback =

components/ssl_config/ssl_config_switches.cc

@@ -28,5 +28,6 @@ const char kTLS13VariantDisabled[] = "disabled";
 const char kTLS13VariantDraft[] = "draft";
 const char kTLS13VariantExperiment[] = "experiment";
 const char kTLS13VariantRecordTypeExperiment[] = "record-type";
+const char kTLS13VariantNoSessionIDExperiment[] = "no-session-id";
 
 }  // namespace switches

components/ssl_config/ssl_config_switches.h

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

net/socket/ssl_client_socket_impl.cc

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

net/ssl/ssl_config.h

@@ -36,9 +36,10 @@ enum TokenBindingParam {
 };
 
 enum TLS13Variant {
-  kTLS13VariantDraft = 0,
-  kTLS13VariantExperiment = 1,
-  kTLS13VariantRecordTypeExperiment = 2,
+  kTLS13VariantDraft,
+  kTLS13VariantExperiment,
+  kTLS13VariantRecordTypeExperiment,
+  kTLS13VariantNoSessionIDExperiment,
 };
 
 // Default minimum protocol version.