ABANDONED Handle multiple AlternateProtocols for each HostPortPair.

net/http/http_server_properties_manager_unittest.cc

Index: net/http/http_server_properties_manager_unittest.cc
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc
index 99647b3fef9aedeb01cecc864cc8ccb49e1fbe73..e0cb84451793a6f572f79575e278993fd488ebe2 100644
--- a/net/http/http_server_properties_manager_unittest.cc
+++ b/net/http/http_server_properties_manager_unittest.cc
@@ -231,14 +231,16 @@ TEST_F(HttpServerPropertiesManagerTest,
   // Verify AlternateProtocol.
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(google_server));
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(mail_server));
-  AlternateProtocolInfo port_alternate_protocol =
-      http_server_props_manager_->GetAlternateProtocol(google_server);
-  EXPECT_EQ(443, port_alternate_protocol.port);
-  EXPECT_EQ(NPN_SPDY_3, port_alternate_protocol.protocol);
-  port_alternate_protocol =
-      http_server_props_manager_->GetAlternateProtocol(mail_server);
-  EXPECT_EQ(444, port_alternate_protocol.port);
-  EXPECT_EQ(NPN_SPDY_3_1, port_alternate_protocol.protocol);
+  AlternateProtocols port_alternate_protocols =
+      http_server_props_manager_->GetAlternateProtocols(google_server);
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(443, port_alternate_protocols[0].port);
+  EXPECT_EQ(NPN_SPDY_3, port_alternate_protocols[0].protocol);
+  port_alternate_protocols =
+      http_server_props_manager_->GetAlternateProtocols(mail_server);
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(444, port_alternate_protocols[0].port);
+  EXPECT_EQ(NPN_SPDY_3_1, port_alternate_protocols[0].protocol);
 
   // Verify SupportsQuic.
   SupportsQuic supports_quic2 =
@@ -480,7 +482,7 @@ TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
   HostPortPair spdy_server_mail("mail.google.com", 80);
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-  http_server_props_manager_->SetAlternateProtocol(spdy_server_mail, 443,
+  http_server_props_manager_->AddAlternateProtocol(spdy_server_mail, 443,
                                                    NPN_SPDY_3, 1);
 
   // Run the task.
@@ -489,10 +491,11 @@ TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
 
   ASSERT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-  AlternateProtocolInfo port_alternate_protocol =
-      http_server_props_manager_->GetAlternateProtocol(spdy_server_mail);
-  EXPECT_EQ(443, port_alternate_protocol.port);
-  EXPECT_EQ(NPN_SPDY_3, port_alternate_protocol.protocol);
+  AlternateProtocols port_alternate_protocols =
+      http_server_props_manager_->GetAlternateProtocols(spdy_server_mail);
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(443, port_alternate_protocols[0].port);
+  EXPECT_EQ(NPN_SPDY_3, port_alternate_protocols[0].protocol);
 }
 
 TEST_F(HttpServerPropertiesManagerTest, SupportsQuic) {
@@ -540,7 +543,7 @@ TEST_F(HttpServerPropertiesManagerTest, Clear) {
 
   HostPortPair spdy_server_mail("mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
-  http_server_props_manager_->SetAlternateProtocol(spdy_server_mail, 443,
+  http_server_props_manager_->AddAlternateProtocol(spdy_server_mail, 443,
                                                    NPN_SPDY_3, 1);
   http_server_props_manager_->SetSupportsQuic(spdy_server_mail, true, "foo");
   ServerNetworkStats stats;
@@ -650,18 +653,18 @@ TEST_F(HttpServerPropertiesManagerTest, BadSupportsQuic) {
   for (int i = 0; i < 200; ++i) {
     std::string server = StringPrintf("www.google.com:%d", i);
     ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
-        net::HostPortPair::FromString(server)));
-    net::AlternateProtocolInfo port_alternate_protocol =
-        http_server_props_manager_->GetAlternateProtocol(
-            net::HostPortPair::FromString(server));
-    EXPECT_EQ(i, port_alternate_protocol.port);
-    EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocol.protocol);
+        HostPortPair::FromString(server)));
+    AlternateProtocols port_alternate_protocols =
+        http_server_props_manager_->GetAlternateProtocols(
+            HostPortPair::FromString(server));
+    EXPECT_EQ(1u, port_alternate_protocols.size());
+    EXPECT_EQ(i, port_alternate_protocols[0].port);
+    EXPECT_EQ(NPN_SPDY_3, port_alternate_protocols[0].protocol);
   }
 
   // Verify SupportsQuic.
-  net::SupportsQuic supports_quic1 =
-      http_server_props_manager_->GetSupportsQuic(
-          net::HostPortPair::FromString("mail.google.com:80"));
+  SupportsQuic supports_quic1 = http_server_props_manager_->GetSupportsQuic(
+      HostPortPair::FromString("mail.google.com:80"));
   EXPECT_TRUE(supports_quic1.used_quic);
   EXPECT_EQ("bar", supports_quic1.address);
 }