Revert "Revert of QUIC - Race Cert Verification with host resolution if

components/network_session_configurator/network_session_configurator_unittest.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/network_session_configurator/network_session_configurator.h"
 
 #include <map>
 #include <memory>
 
 #include "base/metrics/field_trial.h"
@@ skipping 171 matching lines @@
   EXPECT_EQ(0, params_.quic_max_number_of_lossy_connections);
   EXPECT_EQ(1.0f, params_.quic_packet_loss_threshold);
   EXPECT_TRUE(params_.quic_delay_tcp_race);
   EXPECT_FALSE(params_.quic_close_sessions_on_ip_change);
   EXPECT_EQ(net::kIdleConnectionTimeoutSeconds,
             params_.quic_idle_connection_timeout_seconds);
   EXPECT_FALSE(params_.quic_disable_preconnect_if_0rtt);
   EXPECT_FALSE(params_.quic_migrate_sessions_on_network_change);
   EXPECT_FALSE(params_.quic_migrate_sessions_early);
   EXPECT_TRUE(params_.quic_host_whitelist.empty());
+  EXPECT_FALSE(params_.quic_race_cert_verification);
 
   net::HttpNetworkSession::Params default_params;
   EXPECT_EQ(default_params.quic_supported_versions,
             params_.quic_supported_versions);
 }
 
 TEST_F(NetworkSessionConfiguratorTest, DisableQuicFromCommandLine) {
   base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
   base::CommandLine::ForCurrentProcess()->AppendSwitch("disable-quic");
 
@@ skipping 379 matching lines @@
   variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
   base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
 
   ParseFieldTrials();
 
   EXPECT_EQ(2u, params_.quic_host_whitelist.size());
   EXPECT_TRUE(ContainsKey(params_.quic_host_whitelist, "www.example.org"));
   EXPECT_TRUE(ContainsKey(params_.quic_host_whitelist, "www.example.com"));
 }
 
+TEST_F(NetworkSessionConfiguratorTest, QuicRaceCertVerification) {
+  std::map<std::string, std::string> field_trial_params;
+  field_trial_params["race_cert_verification"] = "true";
+  variations::AssociateVariationParams("QUIC", "Enabled", field_trial_params);
+  base::FieldTrialList::CreateFieldTrial("QUIC", "Enabled");
+
+  ParseFieldTrials();
+
+  EXPECT_TRUE(params_.quic_race_cert_verification);
+}
+
 TEST_F(NetworkSessionConfiguratorTest, QuicDisallowedByPolicy) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch("enable-quic");
   is_quic_allowed_by_policy_ = false;
 
   ParseFieldTrialsAndCommandLine();
 
   EXPECT_FALSE(params_.enable_quic);
 }
 
 TEST_F(NetworkSessionConfiguratorTest, TCPFastOpenHttpsEnabled) {
   base::FieldTrialList::CreateFieldTrial("TCPFastOpen", "HttpsEnabled");
 
   ParseFieldTrials();
 
   EXPECT_TRUE(params_.enable_tcp_fast_open_for_ssl);
 }
 
 }  // namespace test