SHP 3: Change ServerNetworkStatsMap to use SchemeHostPort as the key. No change to Pref data.

net/http/http_server_properties_impl_unittest.cc

Index: net/http/http_server_properties_impl_unittest.cc
diff --git a/net/http/http_server_properties_impl_unittest.cc b/net/http/http_server_properties_impl_unittest.cc
index 453e457b0af8b257c8981ce2a0078b5b004939fb..68e9c31f2f65933c535aa26131173b21cd93c18a 100644
--- a/net/http/http_server_properties_impl_unittest.cc
+++ b/net/http/http_server_properties_impl_unittest.cc
@@ -1293,7 +1293,7 @@ TEST_F(SupportsQuicServerPropertiesTest, SetSupportsQuic) {
 typedef HttpServerPropertiesImplTest ServerNetworkStatsServerPropertiesTest;
 
 TEST_F(ServerNetworkStatsServerPropertiesTest, Initialize) {
-  HostPortPair google_server("www.google.com", 443);
+  url::SchemeHostPort google_server("https", "www.google.com", 443);
 
   // Check by initializing empty ServerNetworkStats.
   ServerNetworkStatsMap init_server_network_stats_map(
@@ -1318,7 +1318,7 @@ TEST_F(ServerNetworkStatsServerPropertiesTest, Initialize) {
   // |docs_server| has a ServerNetworkStats, which will be overwritten by
   // InitializeServerNetworkStats(), because |server_network_stats_map| has an
   // entry for |docs_server|.
-  HostPortPair docs_server("docs.google.com", 443);
+  url::SchemeHostPort docs_server("https", "docs.google.com", 443);
   ServerNetworkStats stats_docs;
   stats_docs.srtt = base::TimeDelta::FromMicroseconds(20);
   stats_docs.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(200);
@@ -1336,7 +1336,7 @@ TEST_F(ServerNetworkStatsServerPropertiesTest, Initialize) {
   new_stats_docs.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(250);
   server_network_stats_map.Put(docs_server, new_stats_docs);
   // Add data for mail.google.com:443.
-  HostPortPair mail_server("mail.google.com", 443);
+  url::SchemeHostPort mail_server("https", "mail.google.com", 443);
   ServerNetworkStats stats_mail;
   stats_mail.srtt = base::TimeDelta::FromMicroseconds(30);
   stats_mail.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(300);
@@ -1360,22 +1360,26 @@ TEST_F(ServerNetworkStatsServerPropertiesTest, Initialize) {
 }
 
 TEST_F(ServerNetworkStatsServerPropertiesTest, SetServerNetworkStats) {
-  HostPortPair foo_server("foo", 80);
-  const ServerNetworkStats* stats = impl_.GetServerNetworkStats(foo_server);
-  EXPECT_EQ(NULL, stats);
+  url::SchemeHostPort foo_http_server("http", "foo", 443);
+  url::SchemeHostPort foo_https_server("https", "foo", 443);
+  EXPECT_EQ(NULL, impl_.GetServerNetworkStats(foo_http_server));
+  EXPECT_EQ(NULL, impl_.GetServerNetworkStats(foo_https_server));
 
   ServerNetworkStats stats1;
   stats1.srtt = base::TimeDelta::FromMicroseconds(10);
   stats1.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(100);
-  impl_.SetServerNetworkStats(foo_server, stats1);
+  impl_.SetServerNetworkStats(foo_http_server, stats1);
 
-  const ServerNetworkStats* stats2 = impl_.GetServerNetworkStats(foo_server);
+  const ServerNetworkStats* stats2 =
+      impl_.GetServerNetworkStats(foo_http_server);
   EXPECT_EQ(10, stats2->srtt.ToInternalValue());
   EXPECT_EQ(100, stats2->bandwidth_estimate.ToBitsPerSecond());
+  // Https server should have nothing set for server network stats.
+  EXPECT_EQ(NULL, impl_.GetServerNetworkStats(foo_https_server));
 
   impl_.Clear();
-  const ServerNetworkStats* stats3 = impl_.GetServerNetworkStats(foo_server);
-  EXPECT_EQ(NULL, stats3);
+  EXPECT_EQ(NULL, impl_.GetServerNetworkStats(foo_http_server));
+  EXPECT_EQ(NULL, impl_.GetServerNetworkStats(foo_https_server));
 }
 
 typedef HttpServerPropertiesImplTest QuicServerInfoServerPropertiesTest;