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

net/spdy/spdy_network_transaction_unittest.cc

Index: net/spdy/spdy_network_transaction_unittest.cc
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 67d97f82522530ec11219ea497a31df9930198f7..57523dc3340d574e5c85b8c7ae3979e79f75a24b 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -4230,9 +4230,12 @@ TEST_P(SpdyNetworkTransactionTest, SettingsSaved) {
 
   // Verify that no settings exist initially.
   HostPortPair host_port_pair("www.example.org", helper.port());
+  url::SchemeHostPort spdy_server("https", host_port_pair.host(),
+                                  host_port_pair.port());
+
   SpdySessionPool* spdy_session_pool = helper.session()->spdy_session_pool();
   EXPECT_TRUE(spdy_session_pool->http_server_properties()->GetSpdySettings(
-      host_port_pair).empty());
+      spdy_server).empty());
 
   // Construct the request.
   std::unique_ptr<SpdySerializedFrame> req(
@@ -4290,7 +4293,7 @@ TEST_P(SpdyNetworkTransactionTest, SettingsSaved) {
     // Verify we had two persisted settings.
     const SettingsMap& settings_map =
         spdy_session_pool->http_server_properties()->GetSpdySettings(
-            host_port_pair);
+            spdy_server);
     ASSERT_EQ(2u, settings_map.size());
 
     // Verify the first persisted setting.
@@ -4341,8 +4344,10 @@ TEST_P(SpdyNetworkTransactionTest, SettingsPlayback) {
 
   // Verify that no settings exist initially.
   HostPortPair host_port_pair("www.example.org", helper.port());
+  url::SchemeHostPort spdy_server("https", host_port_pair.host(),
+                                  host_port_pair.port());
   EXPECT_TRUE(spdy_session_pool->http_server_properties()->GetSpdySettings(
-      host_port_pair).empty());
+      spdy_server).empty());
 
   const SpdySettingsIds kSampleId1 = SETTINGS_MAX_CONCURRENT_STREAMS;
   unsigned int kSampleValue1 = 0x0a0a0a0a;
@@ -4351,20 +4356,20 @@ TEST_P(SpdyNetworkTransactionTest, SettingsPlayback) {
 
   // First add a persisted setting.
   spdy_session_pool->http_server_properties()->SetSpdySetting(
-      host_port_pair,
+      spdy_server,
       kSampleId1,
       SETTINGS_FLAG_PLEASE_PERSIST,
       kSampleValue1);
 
   // Next add another persisted setting.
   spdy_session_pool->http_server_properties()->SetSpdySetting(
-      host_port_pair,
+      spdy_server,
       kSampleId2,
       SETTINGS_FLAG_PLEASE_PERSIST,
       kSampleValue2);
 
   EXPECT_EQ(2u, spdy_session_pool->http_server_properties()->GetSpdySettings(
-      host_port_pair).size());
+      spdy_server).size());
 
   // Construct the initial SETTINGS frame.
   SettingsMap initial_settings;
@@ -4375,8 +4380,7 @@ TEST_P(SpdyNetworkTransactionTest, SettingsPlayback) {
 
   // Construct the persisted SETTINGS frame.
   const SettingsMap& settings =
-      spdy_session_pool->http_server_properties()->GetSpdySettings(
-          host_port_pair);
+      spdy_session_pool->http_server_properties()->GetSpdySettings(spdy_server);
   std::unique_ptr<SpdySerializedFrame> settings_frame(
       spdy_util_.ConstructSpdySettings(settings));
 
@@ -4418,7 +4422,7 @@ TEST_P(SpdyNetworkTransactionTest, SettingsPlayback) {
     // Verify we had two persisted settings.
     const SettingsMap& settings_map =
         spdy_session_pool->http_server_properties()->GetSpdySettings(
-            host_port_pair);
+            spdy_server);
     ASSERT_EQ(2u, settings_map.size());
 
     // Verify the first persisted setting.