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

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/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 206 matching lines @@
   base::Time one_day_from_now_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManagerTest);
 };
 
 INSTANTIATE_TEST_CASE_P(Tests,
                         HttpServerPropertiesManagerTest,
                         ::testing::ValuesIn(kHttpServerPropertiesVersions));
 
-TEST_P(HttpServerPropertiesManagerTest,
-       SingleUpdateForTwoSpdyServerPrefChanges) {
-  ExpectCacheUpdate();
-
-  // Set up the prefs for www.google.com:80 and mail.google.com:80 and then set
-  // it twice. Only expect a single cache update.
-
-  base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
-  HostPortPair google_server("www.google.com", 80);
-  url::SchemeHostPort google_scheme_origin_pair("https", "www.google.com", 80);
-  HostPortPair mail_server("mail.google.com", 80);
-  url::SchemeHostPort mail_scheme_origin_pair("https", "mail.google.com", 80);
-
-  // Set supports_spdy for www.google.com:80.
-  server_pref_dict->SetBoolean("supports_spdy", true);
-
-  // Set up alternative_services for www.google.com:80.
-  base::DictionaryValue* alternative_service_dict0 = new base::DictionaryValue;
-  alternative_service_dict0->SetInteger("port", 443);
-  alternative_service_dict0->SetString("protocol_str", "npn-h2");
-  base::DictionaryValue* alternative_service_dict1 = new base::DictionaryValue;
-  alternative_service_dict1->SetInteger("port", 1234);
-  alternative_service_dict1->SetString("protocol_str", "quic");
-  base::ListValue* alternative_service_list0 = new base::ListValue;
-  alternative_service_list0->Append(alternative_service_dict0);
-  alternative_service_list0->Append(alternative_service_dict1);
-  server_pref_dict->SetWithoutPathExpansion("alternative_service",
-                                            alternative_service_list0);
-
-  // Set up ServerNetworkStats for www.google.com:80.
-  base::DictionaryValue* stats = new base::DictionaryValue;
-  stats->SetInteger("srtt", 10);
-  server_pref_dict->SetWithoutPathExpansion("network_stats", stats);
-
-  // Set the server preference for www.google.com:80.
-  base::DictionaryValue* servers_dict = new base::DictionaryValue;
-  servers_dict->SetWithoutPathExpansion("www.google.com:80", server_pref_dict);
-  base::ListValue* servers_list = nullptr;
-  if (GetParam() == 4) {
-    servers_list = new base::ListValue;
-    // |servers_list| takes ownership of |servers_dict|.
-    servers_list->AppendIfNotPresent(servers_dict);
-    servers_dict = new base::DictionaryValue;
-  }
-
-  // Set the preference for mail.google.com server.
-  base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
-
-  // Set supports_spdy for mail.google.com:80
-  server_pref_dict1->SetBoolean("supports_spdy", true);
-
-  // Set up alternative_services for mail.google.com:80.
-  base::DictionaryValue* alternative_service_dict2 = new base::DictionaryValue;
-  alternative_service_dict2->SetString("protocol_str", "npn-spdy/3.1");
-  alternative_service_dict2->SetInteger("port", 444);
-  base::ListValue* alternative_service_list1 = new base::ListValue;
-  alternative_service_list1->Append(alternative_service_dict2);
-  server_pref_dict1->SetWithoutPathExpansion("alternative_service",
-                                             alternative_service_list1);
-
-  // Set up ServerNetworkStats for mail.google.com:80 and it is the MRU server.
-  base::DictionaryValue* stats1 = new base::DictionaryValue;
-  stats1->SetInteger("srtt", 20);
-  server_pref_dict1->SetWithoutPathExpansion("network_stats", stats1);
-  // Set the server preference for mail.google.com:80.
-  servers_dict->SetWithoutPathExpansion("mail.google.com:80",
-                                        server_pref_dict1);
-  base::DictionaryValue http_server_properties_dict;
-  if (GetParam() == 4) {
-    // |servers_list| takes ownership of |servers_dict|.
-    servers_list->AppendIfNotPresent(servers_dict);
-    HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
-    http_server_properties_dict.SetWithoutPathExpansion("servers",
-                                                        servers_list);
-  } else {
-    HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
-                                            GetParam());
-    http_server_properties_dict.SetWithoutPathExpansion("servers",
-                                                        servers_dict);
-  }
-  base::DictionaryValue* supports_quic = new base::DictionaryValue;
-  supports_quic->SetBoolean("used_quic", true);
-  supports_quic->SetString("address", "127.0.0.1");
-  http_server_properties_dict.SetWithoutPathExpansion("supports_quic",
-                                                      supports_quic);
-
-  // Set quic_server_info for www.google.com:80, mail.google.com:80 and
-  // play.google.com:80 and verify the MRU.
-  http_server_props_manager_->SetMaxServerConfigsStoredInProperties(3);
-  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);
-  base::DictionaryValue* quic_server_pref_dict3 = new base::DictionaryValue;
-  std::string quic_server_info3("quic_server_info3");
-  quic_server_pref_dict3->SetStringWithoutPathExpansion("server_info",
-                                                        quic_server_info3);
-  // Set the quic_server_info1 for www.google.com server.
-  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);
-  quic_servers_dict->SetWithoutPathExpansion(mail_quic_server_id.ToString(),
-                                             quic_server_pref_dict2);
-  // Set the quic_server_info3 for play.google.com server.
-  QuicServerId play_quic_server_id("play.google.com", 80);
-  quic_servers_dict->SetWithoutPathExpansion(play_quic_server_id.ToString(),
-                                             quic_server_pref_dict3);
-  http_server_properties_dict.SetWithoutPathExpansion("quic_servers",
-                                                      quic_servers_dict);
-
-  // Set the same value for kHttpServerProperties multiple times.
-  pref_delegate_->SetPrefs(http_server_properties_dict);
-  pref_delegate_->SetPrefs(http_server_properties_dict);
-
-  base::RunLoop().RunUntilIdle();
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-
-  // Verify SupportsSpdy.
-  EXPECT_TRUE(http_server_props_manager_->SupportsRequestPriority(
-      google_scheme_origin_pair));
-  EXPECT_TRUE(http_server_props_manager_->SupportsRequestPriority(
-      mail_scheme_origin_pair));
-  EXPECT_FALSE(http_server_props_manager_->SupportsRequestPriority(
-      url::SchemeHostPort("http", "foo.google.com", 1337)));
-
-  // Verify alternative service.
-  if (GetParam() == 4) {
-    const AlternativeServiceMap& map =
-        http_server_props_manager_->alternative_service_map();
-    ASSERT_EQ(2u, map.size());
-
-    AlternativeServiceMap::const_iterator map_it = map.begin();
-    EXPECT_EQ("mail.google.com", map_it->first.host());
-    ASSERT_EQ(1u, map_it->second.size());
-    EXPECT_EQ(NPN_SPDY_3_1, map_it->second[0].alternative_service.protocol);
-    EXPECT_TRUE(map_it->second[0].alternative_service.host.empty());
-    EXPECT_EQ(444, map_it->second[0].alternative_service.port);
-    ++map_it;
-    EXPECT_EQ("www.google.com", map_it->first.host());
-    ASSERT_EQ(2u, map_it->second.size());
-    EXPECT_EQ(NPN_HTTP_2, map_it->second[0].alternative_service.protocol);
-    EXPECT_TRUE(map_it->second[0].alternative_service.host.empty());
-    EXPECT_EQ(443, map_it->second[0].alternative_service.port);
-    EXPECT_EQ(QUIC, map_it->second[1].alternative_service.protocol);
-    EXPECT_TRUE(map_it->second[1].alternative_service.host.empty());
-    EXPECT_EQ(1234, map_it->second[1].alternative_service.port);
-  } else {
-    const AlternativeServiceMap& map =
-        http_server_props_manager_->alternative_service_map();
-    ASSERT_EQ(2u, map.size());
-    AlternativeServiceMap::const_iterator map_it = map.begin();
-    EXPECT_EQ("www.google.com", map_it->first.host());
-    ASSERT_EQ(2u, map_it->second.size());
-    EXPECT_EQ(NPN_HTTP_2, map_it->second[0].alternative_service.protocol);
-    EXPECT_TRUE(map_it->second[0].alternative_service.host.empty());
-    EXPECT_EQ(443, map_it->second[0].alternative_service.port);
-    EXPECT_EQ(QUIC, map_it->second[1].alternative_service.protocol);
-    EXPECT_TRUE(map_it->second[1].alternative_service.host.empty());
-    EXPECT_EQ(1234, map_it->second[1].alternative_service.port);
-    ++map_it;
-    EXPECT_EQ("mail.google.com", map_it->first.host());
-    ASSERT_EQ(1u, map_it->second.size());
-    EXPECT_EQ(NPN_SPDY_3_1, map_it->second[0].alternative_service.protocol);
-    EXPECT_TRUE(map_it->second[0].alternative_service.host.empty());
-    EXPECT_EQ(444, map_it->second[0].alternative_service.port);
-  }
-
-  // Verify SupportsQuic.
-  IPAddress last_address;
-  EXPECT_TRUE(http_server_props_manager_->GetSupportsQuic(&last_address));
-  EXPECT_EQ("127.0.0.1", last_address.ToString());
-
-  // Verify ServerNetworkStats.
-  const ServerNetworkStats* stats2 =
-      http_server_props_manager_->GetServerNetworkStats(google_server);
-  EXPECT_EQ(10, stats2->srtt.ToInternalValue());
-  const ServerNetworkStats* stats3 =
-      http_server_props_manager_->GetServerNetworkStats(mail_server);
-  EXPECT_EQ(20, stats3->srtt.ToInternalValue());
-
-  // Verify QuicServerInfo.
-  EXPECT_EQ(quic_server_info1, *http_server_props_manager_->GetQuicServerInfo(
-                                   google_quic_server_id));
-  EXPECT_EQ(quic_server_info2, *http_server_props_manager_->GetQuicServerInfo(
-                                   mail_quic_server_id));
-  EXPECT_EQ(quic_server_info3, *http_server_props_manager_->GetQuicServerInfo(
-                                   play_quic_server_id));
-
-  // Verify the MRU order.
-  http_server_props_manager_->SetMaxServerConfigsStoredInProperties(2);
-  EXPECT_EQ(nullptr, http_server_props_manager_->GetQuicServerInfo(
-                         google_quic_server_id));
-  EXPECT_EQ(quic_server_info2, *http_server_props_manager_->GetQuicServerInfo(
-                                   mail_quic_server_id));
-  EXPECT_EQ(quic_server_info3, *http_server_props_manager_->GetQuicServerInfo(
-                                   play_quic_server_id));
-}
-
 TEST_P(HttpServerPropertiesManagerTest, BadCachedHostPortPair) {
   ExpectCacheUpdate();
   // The prefs are automaticalls updated in the case corruption is detected.
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
   base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
 
   // Set supports_spdy for www.google.com:65536.
   server_pref_dict->SetBoolean("supports_spdy", true);
@@ skipping 51 matching lines @@
   // Verify that nothing is set.
   HostPortPair host_port_pair =
       HostPortPair::FromString("www.google.com:65536");
   url::SchemeHostPort scheme_origin("https", host_port_pair.host(),
                                     host_port_pair.port());
   EXPECT_FALSE(
       http_server_props_manager_->SupportsRequestPriority(scheme_origin));
 
   EXPECT_FALSE(HasAlternativeService(scheme_origin));
   const ServerNetworkStats* stats1 =
-      http_server_props_manager_->GetServerNetworkStats(host_port_pair);
+      http_server_props_manager_->GetServerNetworkStats(scheme_origin);
   EXPECT_EQ(nullptr, stats1);
   EXPECT_EQ(0u, http_server_props_manager_->quic_server_info_map().size());
 }
 
 TEST_P(HttpServerPropertiesManagerTest, BadCachedAltProtocolPort) {
   ExpectCacheUpdate();
   // The prefs are automaticalls updated in the case corruption is detected.
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
@@ skipping 41 matching lines @@
 }
 
 TEST_P(HttpServerPropertiesManagerTest, SupportsSpdy) {
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
   // Post an update task to the network thread. SetSupportsSpdy calls
   // ScheduleUpdatePrefsOnNetworkThread.
 
   // Add mail.google.com:443 as a supporting spdy server.
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  // HostPortPair spdy_server_mail("mail.google.com", 443);
   url::SchemeHostPort scheme_origin("https", "mail.google.com", 443);
   EXPECT_FALSE(
       http_server_props_manager_->SupportsRequestPriority(scheme_origin));
-  http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
+  http_server_props_manager_->SetSupportsSpdy(scheme_origin, true);
   // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
-  http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
+  http_server_props_manager_->SetSupportsSpdy(scheme_origin, true);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(
       http_server_props_manager_->SupportsRequestPriority(scheme_origin));
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_P(HttpServerPropertiesManagerTest, SetSpdySetting) {
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
   // Add SpdySetting for mail.google.com:443.
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value1 = 31337;
   http_server_props_manager_->SetSpdySetting(
       spdy_server_mail, id1, flags1, value1);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
 
   const SettingsMap& settings_map1_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
   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);
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_P(HttpServerPropertiesManagerTest, ClearSpdySetting) {
   ExpectPrefsUpdateRepeatedly();
   ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();
 
   // Add SpdySetting for mail.google.com:443.
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value1 = 31337;
   http_server_props_manager_->SetSpdySetting(
       spdy_server_mail, id1, flags1, value1);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
 
   const SettingsMap& settings_map1_ret =
@@ skipping 18 matching lines @@
   ASSERT_EQ(0U, settings_map2_ret.size());
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_P(HttpServerPropertiesManagerTest, ClearAllSpdySetting) {
   ExpectPrefsUpdateRepeatedly();
   ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();
 
   // Add SpdySetting for mail.google.com:443.
-  HostPortPair spdy_server_mail("mail.google.com", 443);
+  url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32_t value1 = 31337;
   http_server_props_manager_->SetSpdySetting(
       spdy_server_mail, id1, flags1, value1);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
 
   const SettingsMap& settings_map1_ret =
@@ skipping 174 matching lines @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   EXPECT_TRUE(http_server_props_manager_->GetSupportsQuic(&address));
   EXPECT_EQ(actual_address, address);
 }
 
 TEST_P(HttpServerPropertiesManagerTest, ServerNetworkStats) {
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThread();
 
-  HostPortPair mail_server("mail.google.com", 80);
+  url::SchemeHostPort mail_server("http", "mail.google.com", 80);
   const ServerNetworkStats* stats =
       http_server_props_manager_->GetServerNetworkStats(mail_server);
   EXPECT_EQ(nullptr, stats);
   ServerNetworkStats stats1;
   stats1.srtt = base::TimeDelta::FromMicroseconds(10);
   http_server_props_manager_->SetServerNetworkStats(mail_server, stats1);
   // ExpectScheduleUpdatePrefsOnNetworkThread() should be called only once.
   http_server_props_manager_->SetServerNetworkStats(mail_server, stats1);
 
   // Run the task.
@@ skipping 24 matching lines @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   EXPECT_EQ(quic_server_info1, *http_server_props_manager_->GetQuicServerInfo(
                                    mail_quic_server_id));
 }
 
 TEST_P(HttpServerPropertiesManagerTest, Clear) {
   ExpectPrefsUpdate();
   ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();
 
-  HostPortPair spdy_server_mail("mail.google.com", 443);
-  url::SchemeHostPort scheme_origin("http", "mail.google.com", 443);
+  url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
   AlternativeService alternative_service(NPN_HTTP_2, "mail.google.com", 1234);
   http_server_props_manager_->SetAlternativeService(
-      scheme_origin, alternative_service, one_day_from_now_);
+      spdy_server_mail, alternative_service, one_day_from_now_);
   IPAddress actual_address(127, 0, 0, 1);
   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);
   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_t value1 = 31337;
   http_server_props_manager_->SetSpdySetting(spdy_server_mail, id1, flags1,
                                              value1);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(
-      http_server_props_manager_->SupportsRequestPriority(scheme_origin));
-  EXPECT_TRUE(HasAlternativeService(scheme_origin));
+      http_server_props_manager_->SupportsRequestPriority(spdy_server_mail));
+  EXPECT_TRUE(HasAlternativeService(spdy_server_mail));
   IPAddress address;
   EXPECT_TRUE(http_server_props_manager_->GetSupportsQuic(&address));
   EXPECT_EQ(actual_address, address);
   const ServerNetworkStats* stats1 =
       http_server_props_manager_->GetServerNetworkStats(spdy_server_mail);
   EXPECT_EQ(10, stats1->srtt.ToInternalValue());
   EXPECT_EQ(quic_server_info1, *http_server_props_manager_->GetQuicServerInfo(
                                    mail_quic_server_id));
 
   // Check SPDY settings values.
   const SettingsMap& settings_map1_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
   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);
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   ExpectPrefsUpdate();
 
   // Clear http server data, time out if we do not get a completion callback.
   http_server_props_manager_->Clear(base::MessageLoop::QuitWhenIdleClosure());
   base::RunLoop().Run();
 
   EXPECT_FALSE(
-      http_server_props_manager_->SupportsRequestPriority(scheme_origin));
-  EXPECT_FALSE(HasAlternativeService(scheme_origin));
+      http_server_props_manager_->SupportsRequestPriority(spdy_server_mail));
+  EXPECT_FALSE(HasAlternativeService(spdy_server_mail));
   EXPECT_FALSE(http_server_props_manager_->GetSupportsQuic(&address));
   const ServerNetworkStats* stats2 =
       http_server_props_manager_->GetServerNetworkStats(spdy_server_mail);
   EXPECT_EQ(nullptr, stats2);
   EXPECT_EQ(nullptr,
             http_server_props_manager_->GetQuicServerInfo(mail_quic_server_id));
 
   const SettingsMap& settings_map2_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
   EXPECT_EQ(0U, settings_map2_ret.size());
@@ skipping 65 matching lines @@
 
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   // Verify alternative service.
   for (int i = 0; i < 200; ++i) {
     std::string server = StringPrintf("www.google.com:%d", i);
     AlternativeServiceVector alternative_service_vector =
         http_server_props_manager_->GetAlternativeServices(
             url::SchemeHostPort("https", "www.google.com", i));
-    if (GetParam() > 4) {
-      ASSERT_EQ(1u, alternative_service_vector.size());
-      EXPECT_EQ(QUIC, alternative_service_vector[0].protocol);
-      EXPECT_EQ(i, alternative_service_vector[0].port);
-    } else {
-      EXPECT_EQ(0u, alternative_service_vector.size());
-    }
+    ASSERT_EQ(1u, alternative_service_vector.size());
+    EXPECT_EQ(QUIC, alternative_service_vector[0].protocol);
+    EXPECT_EQ(i, alternative_service_vector[0].port);
   }
 
   // Verify SupportsQuic.
   IPAddress address;
   ASSERT_TRUE(http_server_props_manager_->GetSupportsQuic(&address));
   EXPECT_EQ("127.0.0.1", address.ToString());
 }
 
 TEST_P(HttpServerPropertiesManagerTest, UpdateCacheWithPrefs) {
   ExpectScheduleUpdatePrefsOnNetworkThreadRepeatedly();
 
-  url::SchemeHostPort server_www("http", "www.google.com", 80);
-  const HostPortPair server_mail("mail.google.com", 80);
-  url::SchemeHostPort mail_server("http", "mail.google.com", 80);
+  const url::SchemeHostPort server_www("http", "www.google.com", 80);
+  const url::SchemeHostPort server_mail("http", "mail.google.com", 80);
 
   // Set alternate protocol.
   AlternativeServiceInfoVector alternative_service_info_vector;
   AlternativeService www_alternative_service1(NPN_HTTP_2, "", 443);
   base::Time expiration1;
   ASSERT_TRUE(base::Time::FromUTCString("2036-12-01 10:00:00", &expiration1));
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(www_alternative_service1, expiration1));
   AlternativeService www_alternative_service2(NPN_HTTP_2, "www.google.com",
                                               1234);
   base::Time expiration2;
   ASSERT_TRUE(base::Time::FromUTCString("2036-12-31 10:00:00", &expiration2));
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(www_alternative_service2, expiration2));
   http_server_props_manager_->SetAlternativeServices(
       server_www, alternative_service_info_vector);
 
   AlternativeService mail_alternative_service(NPN_SPDY_3_1, "foo.google.com",
                                               444);
   base::Time expiration3 = base::Time::Max();
   http_server_props_manager_->SetAlternativeService(
-      mail_server, mail_alternative_service, expiration3);
+      server_mail, mail_alternative_service, 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);
   std::string quic_server_info1("quic_server_info1");
   http_server_props_manager_->SetQuicServerInfo(mail_quic_server_id,
@@ skipping 259 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