Add missing branches for new TLS 1.3 variants.

Bug: 
Change-Id: I932892f3cc4c9f01d31139a0744f8049a1b7a332
Reviewed-on: https://chromium-review.googlesource.com/580545Reviewed-by: David Benjamin <davidben@chromium.org>
Commit-Queue: David Benjamin <davidben@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488491}

components/ssl_config/ssl_config_service_manager_pref.cc

@@ -338,6 +338,11 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
     config->tls13_variant = net::kTLS13VariantDraft;
   } else if (tls13_variant_str == switches::kTLS13VariantExperiment) {
     config->tls13_variant = net::kTLS13VariantExperiment;
+  } else if (tls13_variant_str == switches::kTLS13VariantRecordTypeExperiment) {
+    config->tls13_variant = net::kTLS13VariantRecordTypeExperiment;
+  } else if (tls13_variant_str ==
+             switches::kTLS13VariantNoSessionIDExperiment) {
+    config->tls13_variant = net::kTLS13VariantNoSessionIDExperiment;
   }
 
   config->disabled_cipher_suites = disabled_cipher_suites_;

components/ssl_config/ssl_config_service_manager_pref_unittest.cc

@@ -292,6 +292,50 @@ TEST_F(SSLConfigServiceManagerPrefTest, TLS13VariantFeatureExperiment) {
   EXPECT_EQ(net::kTLS13VariantExperiment, ssl_config.tls13_variant);
 }
 
+// Tests that Record Type Experiment TLS 1.3 can be enabled via field trials.
+TEST_F(SSLConfigServiceManagerPrefTest,
+       TLS13VariantFeatureRecordTypeExperiment) {
+  // Toggle the field trial.
+  variations::testing::VariationParamsManager variation_params(
+      "TLS13Variant", {{"variant", "record-type"}});
+
+  TestingPrefServiceSimple local_state;
+  SSLConfigServiceManager::RegisterPrefs(local_state.registry());
+
+  std::unique_ptr<SSLConfigServiceManager> config_manager(
+      SSLConfigServiceManager::CreateDefaultManager(
+          &local_state, base::ThreadTaskRunnerHandle::Get()));
+  scoped_refptr<SSLConfigService> config_service(config_manager->Get());
+  ASSERT_TRUE(config_service.get());
+
+  SSLConfig ssl_config;
+  config_service->GetSSLConfig(&ssl_config);
+  EXPECT_EQ(net::SSL_PROTOCOL_VERSION_TLS1_3, ssl_config.version_max);
+  EXPECT_EQ(net::kTLS13VariantRecordTypeExperiment, ssl_config.tls13_variant);
+}
+
+// Tests that No SessionID Experiment TLS 1.3 can be enabled via field trials.
+TEST_F(SSLConfigServiceManagerPrefTest,
+       TLS13VariantFeatureNoSessionIDExperiment) {
+  // Toggle the field trial.
+  variations::testing::VariationParamsManager variation_params(
+      "TLS13Variant", {{"variant", "no-session-id"}});
+
+  TestingPrefServiceSimple local_state;
+  SSLConfigServiceManager::RegisterPrefs(local_state.registry());
+
+  std::unique_ptr<SSLConfigServiceManager> config_manager(
+      SSLConfigServiceManager::CreateDefaultManager(
+          &local_state, base::ThreadTaskRunnerHandle::Get()));
+  scoped_refptr<SSLConfigService> config_service(config_manager->Get());
+  ASSERT_TRUE(config_service.get());
+
+  SSLConfig ssl_config;
+  config_service->GetSSLConfig(&ssl_config);
+  EXPECT_EQ(net::SSL_PROTOCOL_VERSION_TLS1_3, ssl_config.version_max);
+  EXPECT_EQ(net::kTLS13VariantNoSessionIDExperiment, ssl_config.tls13_variant);
+}
+
 // Tests that the SSLVersionMax preference overwites the TLS 1.3 variant
 // field trial.
 TEST_F(SSLConfigServiceManagerPrefTest, TLS13SSLVersionMax) {