Alt-Svc 8: Change Supports SPDY list using SHP as the key.

net/http/http_server_properties_impl_unittest.cc

 // Copyright (c) 2012 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_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
@@ skipping 31 matching lines @@
   *os << alternative_service.ToString();
 }
 
 namespace {
 
 const int kMaxSupportsSpdyServerHosts = 500;
 const SpdySettingsIds kSpdySettingsId = SETTINGS_UPLOAD_BANDWIDTH;
 const SpdySettingsFlags kSpdySettingsFlags = SETTINGS_FLAG_PERSISTED;
 
 struct SpdySettingsDataToVerify {
-  HostPortPair spdy_server;
+  url::SchemeHostPort spdy_server;
   uint32_t value;
 };
 
 class HttpServerPropertiesImplTest : public testing::Test {
  protected:
   bool HasAlternativeService(const url::SchemeHostPort& origin) {
     const AlternativeServiceVector alternative_service_vector =
         impl_.GetAlternativeServices(origin);
     return !alternative_service_vector.empty();
   }
 
   bool SetAlternativeService(const url::SchemeHostPort& origin,
                              const AlternativeService& alternative_service) {
     const base::Time expiration =
         base::Time::Now() + base::TimeDelta::FromDays(1);
     return impl_.SetAlternativeService(origin, alternative_service, expiration);
   }
 
-  void InitializeSpdySettingsUploadBandwidth(SpdySettingsMap* spdy_settings_map,
-                                             const HostPortPair& spdy_server,
-                                             uint32_t value) {
+  void InitializeSpdySettingsUploadBandwidth(
+      SpdySettingsMap* spdy_settings_map,
+      const url::SchemeHostPort& spdy_server,
+      uint32_t value) {
     SettingsMap settings_map;
     settings_map[kSpdySettingsId] =
         SettingsFlagsAndValue(kSpdySettingsFlags, value);
     spdy_settings_map->Put(spdy_server, settings_map);
   }
 
   void VerifySpdySettingsUploadBandwidth(
       const SpdySettingsDataToVerify* data_to_verify) {
     const SpdySettingsMap& spdy_settings_map = impl_.spdy_settings_map();
     int count = 0;
@@ skipping 12 matching lines @@
       EXPECT_EQ(data.value, flags_and_value_memory.second);
     }
   }
 
   HttpServerPropertiesImpl impl_;
 };
 
 typedef HttpServerPropertiesImplTest SpdyServerPropertiesTest;
 
 TEST_F(SpdyServerPropertiesTest, Initialize) {
-  HostPortPair spdy_server_google("www.google.com", 443);
+  // HostPortPair spdy_server_google("www.google.com", 443);
   url::SchemeHostPort google_server("https", "www.google.com", 443);
-  std::string spdy_server_g = spdy_server_google.ToString();
+  std::string spdy_server_g = google_server.ToString();
 
-  HostPortPair spdy_server_photos("photos.google.com", 443);
+  // HostPortPair spdy_server_photos("photos.google.com", 443);
   url::SchemeHostPort photos_server("https", "photos.google.com", 443);
-  std::string spdy_server_p = spdy_server_photos.ToString();
+  std::string spdy_server_p = photos_server.ToString();
 
-  HostPortPair spdy_server_docs("docs.google.com", 443);
+  // HostPortPair spdy_server_docs("docs.google.com", 443);
   url::SchemeHostPort docs_server("https", "docs.google.com", 443);
-  std::string spdy_server_d = spdy_server_docs.ToString();
+  std::string spdy_server_d = docs_server.ToString();
 
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  // HostPortPair spdy_server_mail("mail.google.com", 443);
   url::SchemeHostPort mail_server("https", "mail.google.com", 443);
-  std::string spdy_server_m = spdy_server_mail.ToString();
+  std::string spdy_server_m = mail_server.ToString();
 
   // Check by initializing NULL spdy servers.
   impl_.InitializeSpdyServers(NULL, true);
   EXPECT_FALSE(impl_.SupportsRequestPriority(google_server));
 
   // Check by initializing empty spdy servers.
   std::vector<std::string> spdy_servers;
   impl_.InitializeSpdyServers(&spdy_servers, true);
   EXPECT_FALSE(impl_.SupportsRequestPriority(google_server));
 
@@ skipping 72 matching lines @@
   EXPECT_FALSE(impl_.SupportsRequestPriority(photos_server));
   EXPECT_TRUE(impl_.SupportsRequestPriority(google_server));
 }
 
 TEST_F(SpdyServerPropertiesTest, SupportsRequestPriorityTest) {
   url::SchemeHostPort spdy_server_empty("https", std::string(), 443);
 
   EXPECT_FALSE(impl_.SupportsRequestPriority(spdy_server_empty));
 
   // Add www.google.com:443 as supporting SPDY.
-  HostPortPair spdy_server_google("www.google.com", 443);
+  // HostPortPair spdy_server_google("www.google.com", 443);
   url::SchemeHostPort google_server("https", "www.google.com", 443);
-  impl_.SetSupportsSpdy(spdy_server_google, true);
+  impl_.SetSupportsSpdy(google_server, true);
   EXPECT_TRUE(impl_.SupportsRequestPriority(google_server));
 
   // Add mail.google.com:443 as not supporting SPDY.
   url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);
   EXPECT_FALSE(impl_.SupportsRequestPriority(spdy_server_mail));
 
   // Add docs.google.com:443 as supporting SPDY.
-  HostPortPair spdy_server_docs("docs.google.com", 443);
+  // HostPortPair spdy_server_docs("docs.google.com", 443);
   url::SchemeHostPort docs_server("https", "docs.google.com", 443);
-  impl_.SetSupportsSpdy(spdy_server_docs, true);
+  impl_.SetSupportsSpdy(docs_server, true);
   EXPECT_TRUE(impl_.SupportsRequestPriority(docs_server));
 
   // Add www.youtube.com:443 as supporting QUIC.
   url::SchemeHostPort quic_server_youtube("https", "www.youtube.com", 443);
   const AlternativeService alternative_service1(QUIC, "www.youtube.com", 443);
   SetAlternativeService(quic_server_youtube, alternative_service1);
   EXPECT_TRUE(impl_.SupportsRequestPriority(quic_server_youtube));
 
   // Add www.example.com:443 with two alternative services, one supporting QUIC.
   url::SchemeHostPort quic_server_example("https", "www.example.com", 443);
   const AlternativeService alternative_service2(NPN_HTTP_2, "", 443);
   SetAlternativeService(quic_server_example, alternative_service2);
   SetAlternativeService(quic_server_example, alternative_service1);
   EXPECT_TRUE(impl_.SupportsRequestPriority(quic_server_example));
 
   // Verify all the entries are the same after additions.
   EXPECT_TRUE(impl_.SupportsRequestPriority(google_server));
   EXPECT_FALSE(impl_.SupportsRequestPriority(spdy_server_mail));
   EXPECT_TRUE(impl_.SupportsRequestPriority(docs_server));
   EXPECT_TRUE(impl_.SupportsRequestPriority(quic_server_youtube));
   EXPECT_TRUE(impl_.SupportsRequestPriority(quic_server_example));
 }
 
 TEST_F(SpdyServerPropertiesTest, Clear) {
   // Add www.google.com:443 and mail.google.com:443 as supporting SPDY.
-  HostPortPair spdy_server_google("www.google.com", 443);
+  // HostPortPair spdy_server_google("www.google.com", 443);
   url::SchemeHostPort google_server("https", "www.google.com", 443);
-  impl_.SetSupportsSpdy(spdy_server_google, true);
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  impl_.SetSupportsSpdy(google_server, true);
+  // HostPortPair spdy_server_mail("mail.google.com", 443);
   url::SchemeHostPort mail_server("https", "mail.google.com", 443);
-  impl_.SetSupportsSpdy(spdy_server_mail, true);
+  impl_.SetSupportsSpdy(mail_server, true);
 
   EXPECT_TRUE(impl_.SupportsRequestPriority(google_server));
   EXPECT_TRUE(impl_.SupportsRequestPriority(mail_server));
 
   impl_.Clear();
   EXPECT_FALSE(impl_.SupportsRequestPriority(google_server));
   EXPECT_FALSE(impl_.SupportsRequestPriority(mail_server));
 }
 
 TEST_F(SpdyServerPropertiesTest, GetSpdyServerList) {
   base::ListValue spdy_server_list;
 
   // Check there are no spdy_servers.
   impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);
   EXPECT_EQ(0U, spdy_server_list.GetSize());
 
   // Check empty server is not added.
-  HostPortPair spdy_server_empty(std::string(), 443);
+  // HostPortPair spdy_server_empty(std::string(), 443);
   url::SchemeHostPort empty_server("https", std::string(), 443);
-  impl_.SetSupportsSpdy(spdy_server_empty, true);
+  impl_.SetSupportsSpdy(empty_server, true);
   impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);
   EXPECT_EQ(0U, spdy_server_list.GetSize());
 
   std::string string_value_g;
   std::string string_value_m;
-  HostPortPair spdy_server_google("www.google.com", 443);
+  // HostPortPair spdy_server_google("www.google.com", 443);
   url::SchemeHostPort google_server("https", "www.google.com", 443);
-  std::string spdy_server_g = spdy_server_google.ToString();
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  std::string spdy_server_g = google_server.ToString();
+  // HostPortPair spdy_server_mail("mail.google.com", 443);
   url::SchemeHostPort mail_server("https", "mail.google.com", 443);
-  std::string spdy_server_m = spdy_server_mail.ToString();
+  std::string spdy_server_m = mail_server.ToString();
 
   // Add www.google.com:443 as not supporting SPDY.
-  impl_.SetSupportsSpdy(spdy_server_google, false);
+  impl_.SetSupportsSpdy(google_server, false);
   impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);
   EXPECT_EQ(0U, spdy_server_list.GetSize());
 
   // Add www.google.com:443 as supporting SPDY.
-  impl_.SetSupportsSpdy(spdy_server_google, true);
+  impl_.SetSupportsSpdy(google_server, true);
   impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);
   ASSERT_EQ(1U, spdy_server_list.GetSize());
   ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_g));
   ASSERT_EQ(spdy_server_g, string_value_g);
 
   // Add mail.google.com:443 as not supporting SPDY.
-  impl_.SetSupportsSpdy(spdy_server_mail, false);
+  impl_.SetSupportsSpdy(mail_server, false);
   impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);
   ASSERT_EQ(1U, spdy_server_list.GetSize());
   ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_g));
   ASSERT_EQ(spdy_server_g, string_value_g);
 
   // Add mail.google.com:443 as supporting SPDY.
-  impl_.SetSupportsSpdy(spdy_server_mail, true);
+  impl_.SetSupportsSpdy(mail_server, true);
   impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);
   ASSERT_EQ(2U, spdy_server_list.GetSize());
 
   // Verify www.google.com:443 and mail.google.com:443 are in the list.
   ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_m));
   ASSERT_EQ(spdy_server_m, string_value_m);
   ASSERT_TRUE(spdy_server_list.GetString(1, &string_value_g));
   ASSERT_EQ(spdy_server_g, string_value_g);
 
   // Request for only one server and verify that we get only one server.
   impl_.GetSpdyServerList(&spdy_server_list, 1);
   ASSERT_EQ(1U, spdy_server_list.GetSize());
   ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_m));
   ASSERT_EQ(spdy_server_m, string_value_m);
 }
 
 TEST_F(SpdyServerPropertiesTest, MRUOfGetSpdyServerList) {
   base::ListValue spdy_server_list;
 
   std::string string_value_g;
   std::string string_value_m;
-  HostPortPair spdy_server_google("www.google.com", 443);
+  // HostPortPair spdy_server_google("www.google.com", 443);
   url::SchemeHostPort google_server("https", "www.google.com", 443);
-  std::string spdy_server_g = spdy_server_google.ToString();
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  std::string spdy_server_g = google_server.ToString();
+  // HostPortPair spdy_server_mail("mail.google.com", 443);
   url::SchemeHostPort mail_server("https", "mail.google.com", 443);
-  std::string spdy_server_m = spdy_server_mail.ToString();
+  std::string spdy_server_m = mail_server.ToString();
 
   // Add www.google.com:443 as supporting SPDY.
-  impl_.SetSupportsSpdy(spdy_server_google, true);
+  impl_.SetSupportsSpdy(google_server, true);
   impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);
   ASSERT_EQ(1U, spdy_server_list.GetSize());
   ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_g));
   ASSERT_EQ(spdy_server_g, string_value_g);
 
   // Add mail.google.com:443 as supporting SPDY. Verify mail.google.com:443 and
   // www.google.com:443 are in the list.
-  impl_.SetSupportsSpdy(spdy_server_mail, true);
+  impl_.SetSupportsSpdy(mail_server, true);
   impl_.GetSpdyServerList(&spdy_server_list, kMaxSupportsSpdyServerHosts);
   ASSERT_EQ(2U, spdy_server_list.GetSize());
   ASSERT_TRUE(spdy_server_list.GetString(0, &string_value_m));
   ASSERT_EQ(spdy_server_m, string_value_m);
   ASSERT_TRUE(spdy_server_list.GetString(1, &string_value_g));
   ASSERT_EQ(spdy_server_g, string_value_g);
 
   // Get www.google.com:443 should reorder SpdyServerHostPortMap. Verify that it
   // is www.google.com:443 is the MRU server.
   EXPECT_TRUE(impl_.SupportsRequestPriority(google_server));
@@ skipping 636 matching lines @@
 
   EXPECT_TRUE(
       impl_.WasAlternativeServiceRecentlyBroken(bar_alternative_service));
   EXPECT_FALSE(
       impl_.WasAlternativeServiceRecentlyBroken(baz_alternative_service));
 }
 
 typedef HttpServerPropertiesImplTest SpdySettingsServerPropertiesTest;
 
 TEST_F(SpdySettingsServerPropertiesTest, Initialize) {
-  HostPortPair spdy_server_google("www.google.com", 443);
-  HostPortPair spdy_server_photos("photos.google.com", 443);
-  HostPortPair spdy_server_docs("docs.google.com", 443);
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  url::SchemeHostPort spdy_server_google("https", "www.google.com", 443);
+
+  url::SchemeHostPort spdy_server_photos("https", "photos.google.com", 443);
+  url::SchemeHostPort spdy_server_docs("https", "docs.google.com", 443);
+  url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);
 
   // Check by initializing empty spdy settings.
   SpdySettingsMap spdy_settings_map(SpdySettingsMap::NO_AUTO_EVICT);
   impl_.InitializeSpdySettingsServers(&spdy_settings_map);
   EXPECT_TRUE(impl_.GetSpdySettings(spdy_server_google).empty());
 
   // Check by initializing spdy server settings for www.google.com:443 and
   // photos.google.com:443.
   const SpdySettingsDataToVerify data_to_verify1[] = {
       {spdy_server_google, 10000}, {spdy_server_photos, 20000},
@@ skipping 41 matching lines @@
                                         data_to_verify3[3].spdy_server,
                                         data_to_verify3[3].value);
   InitializeSpdySettingsUploadBandwidth(&spdy_settings_map3,
                                         data_to_verify3[1].spdy_server,
                                         data_to_verify3[1].value);
   impl_.InitializeSpdySettingsServers(&spdy_settings_map3);
   VerifySpdySettingsUploadBandwidth(data_to_verify3);
 }
 
 TEST_F(SpdySettingsServerPropertiesTest, SetSpdySetting) {
-  HostPortPair spdy_server_empty(std::string(), 443);
+  url::SchemeHostPort spdy_server_empty("https", std::string(), 443);
   const SettingsMap& settings_map0 = impl_.GetSpdySettings(spdy_server_empty);
   EXPECT_EQ(0U, settings_map0.size());  // Returns kEmptySettingsMap.
 
   // Add www.google.com:443 as persisting.
-  HostPortPair spdy_server_google("www.google.com", 443);
+  url::SchemeHostPort spdy_server_google("https", "www.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value1 = 31337;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));
   // Check the values.
   const SettingsMap& settings_map1_ret =
       impl_.GetSpdySettings(spdy_server_google);
   ASSERT_EQ(1U, settings_map1_ret.size());
   SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
   EXPECT_TRUE(it1_ret != settings_map1_ret.end());
   SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
   EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
   EXPECT_EQ(value1, flags_and_value1_ret.second);
 
   // Add mail.google.com:443 as not persisting.
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);
   const SpdySettingsIds id2 = SETTINGS_DOWNLOAD_BANDWIDTH;
   const SpdySettingsFlags flags2 = SETTINGS_FLAG_NONE;
   const uint32_t value2 = 62667;
   EXPECT_FALSE(impl_.SetSpdySetting(spdy_server_mail, id2, flags2, value2));
   const SettingsMap& settings_map2_ret =
       impl_.GetSpdySettings(spdy_server_mail);
   EXPECT_EQ(0U, settings_map2_ret.size());  // Returns kEmptySettingsMap.
 
   // Add docs.google.com:443 as persisting
-  HostPortPair spdy_server_docs("docs.google.com", 443);
+  url::SchemeHostPort spdy_server_docs("https", "docs.google.com", 443);
   const SpdySettingsIds id3 = SETTINGS_ROUND_TRIP_TIME;
   const SpdySettingsFlags flags3 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value3 = 93997;
   SettingsFlagsAndValue flags_and_value3(flags3, value3);
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id3, flags3, value3));
   // Check the values.
   const SettingsMap& settings_map3_ret =
       impl_.GetSpdySettings(spdy_server_docs);
   ASSERT_EQ(1U, settings_map3_ret.size());
   SettingsMap::const_iterator it3_ret = settings_map3_ret.find(id3);
@@ skipping 20 matching lines @@
   ASSERT_EQ(0U, settings_map5_ret.size());
 
   // Clear all settings.
   ASSERT_GT(impl_.spdy_settings_map().size(), 0U);
   impl_.ClearAllSpdySettings();
   ASSERT_EQ(0U, impl_.spdy_settings_map().size());
 }
 
 TEST_F(SpdySettingsServerPropertiesTest, Clear) {
   // Add www.google.com:443 as persisting.
-  HostPortPair spdy_server_google("www.google.com", 443);
+  url::SchemeHostPort spdy_server_google("https", "www.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value1 = 31337;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));
   // Check the values.
   const SettingsMap& settings_map1_ret =
       impl_.GetSpdySettings(spdy_server_google);
   ASSERT_EQ(1U, settings_map1_ret.size());
   SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
   EXPECT_TRUE(it1_ret != settings_map1_ret.end());
   SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
   EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
   EXPECT_EQ(value1, flags_and_value1_ret.second);
 
   // Add docs.google.com:443 as persisting
-  HostPortPair spdy_server_docs("docs.google.com", 443);
+  url::SchemeHostPort spdy_server_docs("https", "docs.google.com", 443);
   const SpdySettingsIds id3 = SETTINGS_ROUND_TRIP_TIME;
   const SpdySettingsFlags flags3 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value3 = 93997;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id3, flags3, value3));
   // Check the values.
   const SettingsMap& settings_map3_ret =
       impl_.GetSpdySettings(spdy_server_docs);
   ASSERT_EQ(1U, settings_map3_ret.size());
   SettingsMap::const_iterator it3_ret = settings_map3_ret.find(id3);
   EXPECT_TRUE(it3_ret != settings_map3_ret.end());
   SettingsFlagsAndValue flags_and_value3_ret = it3_ret->second;
   EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value3_ret.first);
   EXPECT_EQ(value3, flags_and_value3_ret.second);
 
   impl_.Clear();
   EXPECT_EQ(0U, impl_.GetSpdySettings(spdy_server_google).size());
   EXPECT_EQ(0U, impl_.GetSpdySettings(spdy_server_docs).size());
 }
 
 TEST_F(SpdySettingsServerPropertiesTest, MRUOfGetSpdySettings) {
   // Add www.google.com:443 as persisting.
-  HostPortPair spdy_server_google("www.google.com", 443);
+  url::SchemeHostPort spdy_server_google("https", "www.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value1 = 31337;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));
 
   // Add docs.google.com:443 as persisting
-  HostPortPair spdy_server_docs("docs.google.com", 443);
+  url::SchemeHostPort spdy_server_docs("https", "docs.google.com", 443);
   const SpdySettingsIds id2 = SETTINGS_ROUND_TRIP_TIME;
   const SpdySettingsFlags flags2 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value2 = 93997;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id2, flags2, value2));
 
   // Verify the first element is docs.google.com:443.
   const SpdySettingsMap& map = impl_.spdy_settings_map();
   SpdySettingsMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(spdy_server_docs));
   const SettingsMap& settings_map2_ret = it->second;
@@ skipping 59 matching lines @@
   EXPECT_EQ(actual_address, address);
 
   impl_.Clear();
 
   EXPECT_FALSE(impl_.GetSupportsQuic(&address));
 }
 
 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(
       ServerNetworkStatsMap::NO_AUTO_EVICT);
   impl_.InitializeServerNetworkStats(&init_server_network_stats_map);
   const ServerNetworkStats* stats = impl_.GetServerNetworkStats(google_server);
   EXPECT_EQ(NULL, stats);
 
   // Check by initializing with www.google.com:443.
   ServerNetworkStats stats_google;
   stats_google.srtt = base::TimeDelta::FromMicroseconds(10);
   stats_google.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(100);
   init_server_network_stats_map.Put(google_server, stats_google);
   impl_.InitializeServerNetworkStats(&init_server_network_stats_map);
 
   // Verify data for www.google.com:443.
   ASSERT_EQ(1u, impl_.server_network_stats_map().size());
   EXPECT_EQ(stats_google, *(impl_.GetServerNetworkStats(google_server)));
 
   // Test recency order and overwriting of data.
   //
   // |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);
   // Recency order will be |docs_server| and |google_server|.
   impl_.SetServerNetworkStats(docs_server, stats_docs);
 
   // Prepare |server_network_stats_map| to be loaded by
   // InitializeServerNetworkStats().
   ServerNetworkStatsMap server_network_stats_map(
       ServerNetworkStatsMap::NO_AUTO_EVICT);
 
   // Change the values for |docs_server|.
   ServerNetworkStats new_stats_docs;
   new_stats_docs.srtt = base::TimeDelta::FromMicroseconds(25);
   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);
   server_network_stats_map.Put(mail_server, stats_mail);
 
   // Recency order will be |docs_server|, |google_server| and |mail_server|.
   impl_.InitializeServerNetworkStats(&server_network_stats_map);
 
   const ServerNetworkStatsMap& map = impl_.server_network_stats_map();
   ASSERT_EQ(3u, map.size());
   ServerNetworkStatsMap::const_iterator map_it = map.begin();
 
   EXPECT_TRUE(map_it->first.Equals(docs_server));
   EXPECT_EQ(new_stats_docs, map_it->second);
   ++map_it;
   EXPECT_TRUE(map_it->first.Equals(google_server));
   EXPECT_EQ(stats_google, map_it->second);
   ++map_it;
   EXPECT_TRUE(map_it->first.Equals(mail_server));
   EXPECT_EQ(stats_mail, map_it->second);
 }
 
 TEST_F(ServerNetworkStatsServerPropertiesTest, SetServerNetworkStats) {
-  HostPortPair foo_server("foo", 80);
+  url::SchemeHostPort foo_server("http", "foo", 80);
   const ServerNetworkStats* stats = impl_.GetServerNetworkStats(foo_server);
   EXPECT_EQ(NULL, stats);
 
   ServerNetworkStats stats1;
   stats1.srtt = base::TimeDelta::FromMicroseconds(10);
   stats1.bandwidth_estimate = QuicBandwidth::FromBitsPerSecond(100);
   impl_.SetServerNetworkStats(foo_server, stats1);
 
   const ServerNetworkStats* stats2 = impl_.GetServerNetworkStats(foo_server);
   EXPECT_EQ(10, stats2->srtt.ToInternalValue());
@@ skipping 105 matching lines @@
   EXPECT_EQ(quic_server_info1, *(impl_.GetQuicServerInfo(quic_server_id)));
 
   impl_.Clear();
   EXPECT_EQ(0u, impl_.quic_server_info_map().size());
   EXPECT_EQ(nullptr, impl_.GetQuicServerInfo(quic_server_id));
 }
 
 }  // namespace
 
 }  // namespace net