Implement multiple alternative services per origin.

net/quic/quic_network_transaction_unittest.cc

Index: net/quic/quic_network_transaction_unittest.cc
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc
index 0720f8b60da334d468d00cf772bacebce2d4bbc9..f177210dfb1dda9e7162eaa6bacaab726e52bcdc 100644
--- a/net/quic/quic_network_transaction_unittest.cc
+++ b/net/quic/quic_network_transaction_unittest.cc
@@ -325,24 +325,25 @@ class QuicNetworkTransactionTest
     crypto_client_stream_factory_.set_handshake_mode(handshake_mode);
     HostPortPair host_port_pair = HostPortPair::FromURL(request_.url);
     AlternativeService alternative_service(QUIC, host_port_pair.host(), 80);
-    http_server_properties_.SetAlternativeService(host_port_pair,
+    http_server_properties_.AddAlternativeService(host_port_pair,
                                                   alternative_service, 1.0);
   }
 
   void ExpectBrokenAlternateProtocolMapping() {
     const HostPortPair origin = HostPortPair::FromURL(request_.url);
-    const AlternativeService alternative_service =
-        http_server_properties_.GetAlternativeService(origin);
-    EXPECT_NE(UNINITIALIZED_ALTERNATE_PROTOCOL, alternative_service.protocol);
+    const AlternativeServiceVector alternative_service_vector =
+        http_server_properties_.GetAlternativeServices(origin);
+    EXPECT_EQ(1u, alternative_service_vector.size());
     EXPECT_TRUE(http_server_properties_.IsAlternativeServiceBroken(
-        alternative_service));
+        alternative_service_vector[0]));
   }
 
   void ExpectQuicAlternateProtocolMapping() {
-    const AlternativeService alternative_service =
-        http_server_properties_.GetAlternativeService(
-            HostPortPair::FromURL(request_.url));
-    EXPECT_EQ(QUIC, alternative_service.protocol);
+    const HostPortPair origin = HostPortPair::FromURL(request_.url);
+    const AlternativeServiceVector alternative_service_vector =
+        http_server_properties_.GetAlternativeServices(origin);
+    EXPECT_EQ(1u, alternative_service_vector.size());
+    EXPECT_EQ(QUIC, alternative_service_vector[0].protocol);
   }
 
   void AddHangingNonAlternateProtocolSocketData() {
@@ -870,7 +871,7 @@ class QuicAltSvcCertificateVerificationTest
 
     CreateSessionWithNextProtos();
     AlternativeService alternative_service(QUIC, alternative);
-    session_->http_server_properties()->SetAlternativeService(
+    session_->http_server_properties()->AddAlternativeService(
         origin, alternative_service, 1.0);
     scoped_ptr<HttpNetworkTransaction> trans(
         new HttpNetworkTransaction(DEFAULT_PRIORITY, session_.get()));