Remove insecure QUIC support

net/http/http_server_properties_manager_unittest.cc

 // Copyright 2014 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 "net/http/http_server_properties_manager.h"
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 244 matching lines @@
   base::DictionaryValue* quic_servers_dict = new base::DictionaryValue;
   base::DictionaryValue* quic_server_pref_dict1 = new base::DictionaryValue;
   std::string quic_server_info1("quic_server_info1");
   quic_server_pref_dict1->SetStringWithoutPathExpansion("server_info",
                                                         quic_server_info1);
   base::DictionaryValue* quic_server_pref_dict2 = new base::DictionaryValue;
   std::string quic_server_info2("quic_server_info2");
   quic_server_pref_dict2->SetStringWithoutPathExpansion("server_info",
                                                         quic_server_info2);
   // Set the quic_server_info1 for www.google.com server.
-  QuicServerId google_quic_server_id("www.google.com", 80, false);
+  QuicServerId google_quic_server_id("www.google.com", 80);
   quic_servers_dict->SetWithoutPathExpansion(google_quic_server_id.ToString(),
                                              quic_server_pref_dict1);
   // Set the quic_server_info2 for mail.google.com server.
-  QuicServerId mail_quic_server_id("mail.google.com", 80, false);
+  QuicServerId mail_quic_server_id("mail.google.com", 80);
   quic_servers_dict->SetWithoutPathExpansion(mail_quic_server_id.ToString(),
                                              quic_server_pref_dict2);
   http_server_properties_dict->SetWithoutPathExpansion("quic_servers",
                                                        quic_servers_dict);
 
   // Set the same value for kHttpServerProperties multiple times.
   pref_service_.SetManagedPref(kTestHttpServerProperties,
                                http_server_properties_dict);
   base::DictionaryValue* http_server_properties_dict2 =
       http_server_properties_dict->DeepCopy();
@@ skipping 461 matching lines @@
 
   const ServerNetworkStats* stats2 =
       http_server_props_manager_->GetServerNetworkStats(mail_server);
   EXPECT_EQ(10, stats2->srtt.ToInternalValue());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, QuicServerInfo) {
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
-  QuicServerId mail_quic_server_id("mail.google.com", 80, false);
+  QuicServerId mail_quic_server_id("mail.google.com", 80);
   EXPECT_EQ(nullptr,
             http_server_props_manager_->GetQuicServerInfo(mail_quic_server_id));
   std::string quic_server_info1("quic_server_info1");
   http_server_props_manager_->SetQuicServerInfo(mail_quic_server_id,
                                                 quic_server_info1);
   // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
   http_server_props_manager_->SetQuicServerInfo(mail_quic_server_id,
                                                 quic_server_info1);
 
   // Run the task.
@@ skipping 13 matching lines @@
   AlternativeService alternative_service(NPN_HTTP_2, "mail.google.com", 1234);
   http_server_props_manager_->SetAlternativeService(
       spdy_server_mail, alternative_service, 1.0, one_day_from_now_);
   IPAddressNumber actual_address;
   CHECK(ParseIPLiteralToNumber("127.0.0.1", &actual_address));
   http_server_props_manager_->SetSupportsQuic(true, actual_address);
   ServerNetworkStats stats;
   stats.srtt = base::TimeDelta::FromMicroseconds(10);
   http_server_props_manager_->SetServerNetworkStats(spdy_server_mail, stats);
 
-  QuicServerId mail_quic_server_id("mail.google.com", 80, false);
+  QuicServerId mail_quic_server_id("mail.google.com", 80);
   std::string quic_server_info1("quic_server_info1");
   http_server_props_manager_->SetQuicServerInfo(mail_quic_server_id,
                                                 quic_server_info1);
 
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32 value1 = 31337;
   http_server_props_manager_->SetSpdySetting(spdy_server_mail, id1, flags1,
                                              value1);
 
@@ skipping 138 matching lines @@
   base::Time expiration3 = base::Time::Max();
   http_server_props_manager_->SetAlternativeService(
       server_mail, mail_alternative_service, 0.2, expiration3);
 
   // Set ServerNetworkStats.
   ServerNetworkStats stats;
   stats.srtt = base::TimeDelta::FromInternalValue(42);
   http_server_props_manager_->SetServerNetworkStats(server_mail, stats);
 
   // Set quic_server_info string.
-  QuicServerId mail_quic_server_id("mail.google.com", 80, false);
+  QuicServerId mail_quic_server_id("mail.google.com", 80);
   std::string quic_server_info1("quic_server_info1");
   http_server_props_manager_->SetQuicServerInfo(mail_quic_server_id,
                                                 quic_server_info1);
 
   // Set SupportsQuic.
   IPAddressNumber actual_address;
   CHECK(ParseIPLiteralToNumber("127.0.0.1", &actual_address));
   http_server_props_manager_->SetSupportsQuic(true, actual_address);
 
   // Update cache.
   ExpectPrefsUpdate();
   ExpectCacheUpdate();
   http_server_props_manager_->ScheduleUpdateCacheOnPrefThread();
   base::RunLoop().RunUntilIdle();
 
   // Verify preferences.
   const char expected_json[] =
       "{\"quic_servers\":{\"http://"

[ramant (doing other things), 2015/10/21 04:43:24]

nit: I think this needs to be https.

[Ryan Hamilton, 2015/10/21 16:56:07]

Good point! Thanks. Done.

       "mail.google.com:80\":{\"server_info\":\"quic_server_info1\"}},"
       "\"servers\":{\"mail.google.com:80\":{\"alternative_service\":[{"
       "\"expiration\":\"9223372036854775807\",\"host\":\"foo.google.com\","
       "\"port\":444,\"probability\":0.2,\"protocol_str\":\"npn-spdy/3.1\"}],"
       "\"network_stats\":{\"srtt\":42}},\"www.google.com:80\":{"
       "\"alternative_service\":[{\"expiration\":\"13756212000000000\","
       "\"port\":443,\"probability\":1.0,\"protocol_str\":\"npn-h2\"},"
       "{\"expiration\":\"13758804000000000\",\"host\":\"www.google.com\","
       "\"port\":1234,\"probability\":0.7,\"protocol_str\":\"npn-h2\"}]}},"
       "\"supports_quic\":{\"address\":\"127.0.0.1\",\"used_quic\":true},"
@@ skipping 163 matching lines @@
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnPrefThread();
   // Run the task after shutdown, but before deletion.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace net