Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / io_thread_unittest.cc

diff --git a/src/chrome/browser/io_thread_unittest.cc b/src/chrome/browser/io_thread_unittest.cc
index 1563e9e..a78108d 100644 (file)
--- a/src/chrome/browser/io_thread_unittest.cc
+++ b/src/chrome/browser/io_thread_unittest.cc
@@ -81,7 +81,6 @@ TEST_F(IOThreadTest, SpdyFieldTrialHoldbackControl) {
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11,
                           net::kProtoQUIC1SPDY3,
-                          net::kProtoSPDY3,
                           net::kProtoSPDY31));
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   EXPECT_TRUE(use_alternate_protocols);
@@ -93,7 +92,6 @@ TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Enabled) {
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11,
                           net::kProtoQUIC1SPDY3,
-                          net::kProtoSPDY3,
                           net::kProtoSPDY31,
                           net::kProtoSPDY4));
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
@@ -106,7 +104,6 @@ TEST_F(IOThreadTest, SpdyFieldTrialSpdy4Control) {
   EXPECT_THAT(globals_.next_protos,
               ElementsAre(net::kProtoHTTP11,
                           net::kProtoQUIC1SPDY3,
-                          net::kProtoSPDY3,
                           net::kProtoSPDY31));
   globals_.use_alternate_protocols.CopyToIfSet(&use_alternate_protocols);
   EXPECT_TRUE(use_alternate_protocols);
@@ -127,7 +124,6 @@ TEST_F(IOThreadTest, EnableQuicFromFieldTrialGroup) {
   net::HttpNetworkSession::Params params;
   InitializeNetworkSessionParams(&params);
   EXPECT_TRUE(params.enable_quic);
-  EXPECT_FALSE(params.enable_quic_time_based_loss_detection);
   EXPECT_EQ(1350u, params.quic_max_packet_length);
   EXPECT_EQ(1.0, params.alternate_protocol_probability_threshold);
   EXPECT_EQ(default_params.quic_supported_versions,
@@ -135,6 +131,7 @@ TEST_F(IOThreadTest, EnableQuicFromFieldTrialGroup) {
   EXPECT_EQ(net::QuicTagVector(), params.quic_connection_options);
   EXPECT_FALSE(params.quic_always_require_handshake_confirmation);
   EXPECT_FALSE(params.quic_disable_connection_pooling);
+  EXPECT_EQ(0, params.quic_load_server_info_timeout_ms);
 }
 
 TEST_F(IOThreadTest, EnableQuicFromCommandLine) {
@@ -181,35 +178,6 @@ TEST_F(IOThreadTest, EnablePacingFromFieldTrialParams) {
   EXPECT_EQ(options, params.quic_connection_options);
 }
 
-TEST_F(IOThreadTest, EnableTimeBasedLossDetectionFromCommandLine) {
-  command_line_.AppendSwitch("enable-quic");
-  command_line_.AppendSwitch("enable-quic-time-based-loss-detection");
-
-  ConfigureQuicGlobals();
-  net::HttpNetworkSession::Params params;
-  InitializeNetworkSessionParams(&params);
-  EXPECT_TRUE(params.enable_quic_time_based_loss_detection);
-}
-
-TEST_F(IOThreadTest, EnableTimeBasedLossDetectionFromFieldTrialGroup) {
-  field_trial_group_ = "EnabledWithTimeBasedLossDetection";
-
-  ConfigureQuicGlobals();
-  net::HttpNetworkSession::Params params;
-  InitializeNetworkSessionParams(&params);
-  EXPECT_TRUE(params.enable_quic_time_based_loss_detection);
-}
-
-TEST_F(IOThreadTest, EnableTimeBasedLossDetectionFromFieldTrialParams) {
-  field_trial_group_ = "Enabled";
-  field_trial_params_["enable_time_based_loss_detection"] = "true";
-
-  ConfigureQuicGlobals();
-  net::HttpNetworkSession::Params params;
-  InitializeNetworkSessionParams(&params);
-  EXPECT_TRUE(params.enable_quic_time_based_loss_detection);
-}
-
 TEST_F(IOThreadTest, PacketLengthFromCommandLine) {
   command_line_.AppendSwitch("enable-quic");
   command_line_.AppendSwitchASCII("quic-max-packet-length", "1350");
@@ -337,6 +305,15 @@ TEST_F(IOThreadTest,
   EXPECT_TRUE(params.quic_disable_connection_pooling);
 }
 
+TEST_F(IOThreadTest, QuicLoadServerInfoTimeoutFromFieldTrialParams) {
+  field_trial_group_ = "Enabled";
+  field_trial_params_["load_server_info_timeout"] = "50";
+  ConfigureQuicGlobals();
+  net::HttpNetworkSession::Params params;
+  InitializeNetworkSessionParams(&params);
+  EXPECT_EQ(50, params.quic_load_server_info_timeout_ms);
+}
+
 TEST_F(IOThreadTest,
        AlternateProtocolProbabilityThresholdFromFlag) {
   command_line_.AppendSwitchASCII("alternate-protocol-probability-threshold",