ABANDONED Handle multiple AlternateProtocols for each HostPortPair.

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/basictypes.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 201 matching lines @@
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(
       net::HostPortPair::FromString("mail.google.com:80")));
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(
       net::HostPortPair::FromString("foo.google.com:1337")));
 
   // Verify AlternateProtocol.
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
       net::HostPortPair::FromString("www.google.com:80")));
   ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
       net::HostPortPair::FromString("mail.google.com:80")));
-  net::AlternateProtocolInfo port_alternate_protocol =
+  net::AlternateProtocols port_alternate_protocols =
       http_server_props_manager_->GetAlternateProtocol(
           net::HostPortPair::FromString("www.google.com:80"));
-  EXPECT_EQ(443, port_alternate_protocol.port);
-  EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocol.protocol);
-  port_alternate_protocol = http_server_props_manager_->GetAlternateProtocol(
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(443, port_alternate_protocols[0].port);
+  EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocols[0].protocol);
+  port_alternate_protocols = http_server_props_manager_->GetAlternateProtocol(
       net::HostPortPair::FromString("mail.google.com:80"));
-  EXPECT_EQ(444, port_alternate_protocol.port);
-  EXPECT_EQ(net::NPN_SPDY_3_1, port_alternate_protocol.protocol);
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(444, port_alternate_protocols[0].port);
+  EXPECT_EQ(net::NPN_SPDY_3_1, port_alternate_protocols[0].protocol);
 
   // Verify SupportsQuic.
   net::SupportsQuic supports_quic2 =
       http_server_props_manager_->GetSupportsQuic(
           net::HostPortPair::FromString("www.google.com:80"));
   EXPECT_TRUE(supports_quic2.used_quic);
   EXPECT_EQ("foo", supports_quic2.address);
   supports_quic2 = http_server_props_manager_->GetSupportsQuic(
       net::HostPortPair::FromString("mail.google.com:80"));
   EXPECT_FALSE(supports_quic2.used_quic);
@@ skipping 118 matching lines @@
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
   ExpectPrefsUpdate();
 
   net::HostPortPair spdy_server_mail("mail.google.com", 80);
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-  http_server_props_manager_->SetAlternateProtocol(
+  http_server_props_manager_->AddAlternateProtocol(
       spdy_server_mail, 443, net::NPN_SPDY_3, 1);
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   ASSERT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-  net::AlternateProtocolInfo port_alternate_protocol =
+  net::AlternateProtocols port_alternate_protocols =
       http_server_props_manager_->GetAlternateProtocol(spdy_server_mail);
-  EXPECT_EQ(443, port_alternate_protocol.port);
-  EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocol.protocol);
+  ASSERT_EQ(1u, port_alternate_protocols.size());
+  EXPECT_EQ(443, port_alternate_protocols[0].port);
+  EXPECT_EQ(net::NPN_SPDY_3, port_alternate_protocols[0].protocol);
 }
 
 TEST_F(HttpServerPropertiesManagerTest, SupportsQuic) {
   ExpectPrefsUpdate();
 
   net::HostPortPair quic_server_mail("mail.google.com", 80);
   net::SupportsQuic supports_quic = http_server_props_manager_->GetSupportsQuic(
       quic_server_mail);
   EXPECT_FALSE(supports_quic.used_quic);
   EXPECT_EQ("", supports_quic.address);
   http_server_props_manager_->SetSupportsQuic(quic_server_mail, true, "foo");
 
   // Run the task.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   net::SupportsQuic supports_quic1 =
       http_server_props_manager_->GetSupportsQuic(quic_server_mail);
   EXPECT_TRUE(supports_quic1.used_quic);
   EXPECT_EQ("foo", supports_quic1.address);
 }
 
 TEST_F(HttpServerPropertiesManagerTest, Clear) {
   ExpectPrefsUpdate();
 
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
-  http_server_props_manager_->SetAlternateProtocol(
+  http_server_props_manager_->AddAlternateProtocol(
       spdy_server_mail, 443, net::NPN_SPDY_3, 1);
   http_server_props_manager_->SetSupportsQuic(spdy_server_mail, true, "foo");
 
   const net::SpdySettingsIds id1 = net::SETTINGS_UPLOAD_BANDWIDTH;
   const net::SpdySettingsFlags flags1 = net::SETTINGS_FLAG_PLEASE_PERSIST;
   const uint32 value1 = 31337;
   http_server_props_manager_->SetSpdySetting(
       spdy_server_mail, id1, flags1, value1);
 
   // Run the task.
@@ skipping 108 matching lines @@
   // 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
 
 }  // namespace net