SHP 2: Change SpdySettingsMap to use SchemeHostPort as the key. No change to Pref data.

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 <memory>
 #include <string>
 #include <vector>
 
@@ skipping 32 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 HostPortPair& origin) {
     const AlternativeServiceVector alternative_service_vector =
         impl_.GetAlternativeServices(origin);
     return !alternative_service_vector.empty();
   }
 
   bool SetAlternativeService(const HostPortPair& 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 882 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 18 matching lines @@
   const SettingsMap& settings_map5_ret =
       impl_.GetSpdySettings(spdy_server_google);
   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, SpdySettingWithSchemeHostPort) {
+  // Test SpdySettingMap is correctly maintained with setting and
+  // clearing method.
+  // Add https://www.google.com:443 as persisting.
+  url::SchemeHostPort https_www_server("https", "www.google.com", 443);
+  url::SchemeHostPort http_www_server("http", "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(https_www_server, id1, flags1, value1));
+  // Check the values.
+  const SettingsMap& settings_map1_ret =
+      impl_.GetSpdySettings(https_www_server);
+  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);
+  // Check the values is not set for http server.
+  const SettingsMap& settings_map1_ret2 =
+      impl_.GetSpdySettings(http_www_server);
+  ASSERT_EQ(0U, settings_map1_ret2.size());
+
+  // Add http://www.google.com:443 as persisting
+  const SpdySettingsIds id2 = SETTINGS_ROUND_TRIP_TIME;
+  const SpdySettingsFlags flags2 = SETTINGS_FLAG_PLEASE_PERSIST;
+  const uint32_t value2 = 93997;
+  SettingsFlagsAndValue flags_and_value2(flags2, value2);
+  EXPECT_TRUE(impl_.SetSpdySetting(http_www_server, id2, flags2, value2));
+  // Check the values.
+  const SettingsMap& settings_map2_ret = impl_.GetSpdySettings(http_www_server);
+  ASSERT_EQ(1U, settings_map2_ret.size());
+  SettingsMap::const_iterator it2_ret = settings_map2_ret.find(id2);
+  EXPECT_TRUE(it2_ret != settings_map2_ret.end());
+  SettingsFlagsAndValue flags_and_value2_ret = it2_ret->second;
+  EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value2_ret.first);
+  EXPECT_EQ(value2, flags_and_value2_ret.second);
+
+  // Clear https://www.google.com:443 as persisting.
+  impl_.ClearSpdySettings(https_www_server);
+  // Check the values.
+  const SettingsMap& settings_map3_ret =
+      impl_.GetSpdySettings(https_www_server);
+  ASSERT_EQ(0U, settings_map3_ret.size());
+  // Check the setting is not cleared for http server.
+  const SettingsMap& settings_map3_ret2 =
+      impl_.GetSpdySettings(http_www_server);
+  ASSERT_EQ(1U, settings_map3_ret2.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 252 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