Update HttpServerProperties::*AlternateProtocol* interface.

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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 100 matching lines @@
   HostPortPair spdy_server_mail("mail.google.com", 443);
   EXPECT_FALSE(impl_.SupportsRequestPriority(spdy_server_mail));
 
   // Add docs.google.com:443 as supporting SPDY.
   HostPortPair spdy_server_docs("docs.google.com", 443);
   impl_.SetSupportsSpdy(spdy_server_docs, true);
   EXPECT_TRUE(impl_.SupportsRequestPriority(spdy_server_docs));
 
   // Add www.youtube.com:443 as supporting QUIC.
   HostPortPair quic_server_youtube("www.youtube.com", 443);
-  impl_.SetAlternateProtocol(quic_server_youtube, 443, QUIC, 1);
+  const AlternativeService alternative_service(QUIC, "www.youtube.com", 443);
+  impl_.SetAlternativeService(quic_server_youtube, alternative_service, 1.0);
   EXPECT_TRUE(impl_.SupportsRequestPriority(quic_server_youtube));
 
   // Verify all the entries are the same after additions.
   EXPECT_TRUE(impl_.SupportsRequestPriority(spdy_server_google));
   EXPECT_FALSE(impl_.SupportsRequestPriority(spdy_server_mail));
   EXPECT_TRUE(impl_.SupportsRequestPriority(spdy_server_docs));
   EXPECT_TRUE(impl_.SupportsRequestPriority(quic_server_youtube));
 }
 
 TEST_F(SpdyServerPropertiesTest, Clear) {
@@ skipping 104 matching lines @@
   ASSERT_EQ(spdy_server_g, string_value_g);
   ASSERT_TRUE(spdy_server_list.GetString(1, &string_value_m));
   ASSERT_EQ(spdy_server_m, string_value_m);
 }
 
 typedef HttpServerPropertiesImplTest AlternateProtocolServerPropertiesTest;
 
 TEST_F(AlternateProtocolServerPropertiesTest, Basic) {
   HostPortPair test_host_port_pair("foo", 80);
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
-  impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
+
+  AlternativeService alternative_service(NPN_SPDY_3, "foo", 443);
+  impl_.SetAlternativeService(test_host_port_pair, alternative_service, 1.0);
   ASSERT_TRUE(HasAlternativeService(test_host_port_pair));
-  const AlternativeService alternative_service =
-      impl_.GetAlternativeService(test_host_port_pair);
+  alternative_service = impl_.GetAlternativeService(test_host_port_pair);
   EXPECT_EQ(443, alternative_service.port);
   EXPECT_EQ(NPN_SPDY_3, alternative_service.protocol);
 
   impl_.Clear();
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, DefaultProbabilityExcluded) {
   HostPortPair test_host_port_pair("foo", 80);
-  impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, .99);
+  const AlternativeService alternative_service(NPN_SPDY_3, "foo", 443);
+  impl_.SetAlternativeService(test_host_port_pair, alternative_service, 0.99);
 
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, Probability) {
-  impl_.SetAlternateProtocolProbabilityThreshold(.25);
+  impl_.SetAlternateProtocolProbabilityThreshold(0.25);
 
   HostPortPair test_host_port_pair("foo", 80);
-  impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 0.5);
+  const AlternativeService alternative_service(NPN_SPDY_3, "foo", 443);
+  impl_.SetAlternativeService(test_host_port_pair, alternative_service, 0.5);
+  EXPECT_TRUE(HasAlternativeService(test_host_port_pair));
 
   AlternateProtocolMap::const_iterator it =
       impl_.alternate_protocol_map().Peek(test_host_port_pair);
   EXPECT_TRUE(it != impl_.alternate_protocol_map().end());
   EXPECT_EQ(443, it->second.port);
   EXPECT_EQ(NPN_SPDY_3, it->second.protocol);
   EXPECT_EQ(0.5, it->second.probability);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ProbabilityExcluded) {
-  impl_.SetAlternateProtocolProbabilityThreshold(.75);
+  impl_.SetAlternateProtocolProbabilityThreshold(0.75);
 
   HostPortPair test_host_port_pair("foo", 80);
-
-  impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, .5);
+  const AlternativeService alternative_service(NPN_SPDY_3, "foo", 443);
+  impl_.SetAlternativeService(test_host_port_pair, alternative_service, 0.5);
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, Initialize) {
   HostPortPair test_host_port_pair1("foo1", 80);
-  impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1.0);
-  impl_.SetBrokenAlternateProtocol(test_host_port_pair1);
+  const AlternativeService alternative_service1(NPN_SPDY_3, "foo1", 443);
+  impl_.SetAlternativeService(test_host_port_pair1, alternative_service1, 1.0);
+  impl_.MarkAlternativeServiceBroken(alternative_service1);
+
   HostPortPair test_host_port_pair2("foo2", 80);
-  impl_.SetAlternateProtocol(test_host_port_pair2, 443, NPN_SPDY_3, 1.0);
+  const AlternativeService alternative_service2(NPN_SPDY_3, "foo2", 443);
+  impl_.SetAlternativeService(test_host_port_pair2, alternative_service2, 1.0);
 
   AlternateProtocolMap alternate_protocol_map(
       AlternateProtocolMap::NO_AUTO_EVICT);
   AlternateProtocolInfo alternate(123, NPN_SPDY_3, 1);
   alternate_protocol_map.Put(test_host_port_pair2, alternate);
   HostPortPair test_host_port_pair3("foo3", 80);
   alternate.port = 1234;
   alternate_protocol_map.Put(test_host_port_pair3, alternate);
   impl_.InitializeAlternateProtocolServers(&alternate_protocol_map);
 
   // Verify test_host_port_pair3 is the MRU server.
   const AlternateProtocolMap& map = impl_.alternate_protocol_map();
   AlternateProtocolMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(test_host_port_pair3));
   EXPECT_EQ(1234, it->second.port);
   EXPECT_EQ(NPN_SPDY_3, it->second.protocol);
 
   ASSERT_TRUE(HasAlternativeService(test_host_port_pair1));
-  AlternativeService alternative_service(NPN_SPDY_3,
-                                         test_host_port_pair1.host(), 443);
-  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
-  alternative_service = impl_.GetAlternativeService(test_host_port_pair2);
+  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service1));
+  AlternativeService alternative_service =
+      impl_.GetAlternativeService(test_host_port_pair2);
   EXPECT_EQ(123, alternative_service.port);
   EXPECT_EQ(NPN_SPDY_3, alternative_service.protocol);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MRUOfGetAlternateProtocol) {
   HostPortPair test_host_port_pair1("foo1", 80);
-  impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1.0);
+  const AlternativeService alternative_service1(NPN_SPDY_3, "foo1", 443);
+  impl_.SetAlternativeService(test_host_port_pair1, alternative_service1, 1.0);
   HostPortPair test_host_port_pair2("foo2", 80);
-  impl_.SetAlternateProtocol(test_host_port_pair2, 1234, NPN_SPDY_3, 1.0);
+  const AlternativeService alternative_service2(NPN_SPDY_3, "foo2", 1234);
+  impl_.SetAlternativeService(test_host_port_pair2, alternative_service2, 1.0);
 
   const AlternateProtocolMap& map = impl_.alternate_protocol_map();
   AlternateProtocolMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(test_host_port_pair2));
   EXPECT_EQ(1234, it->second.port);
   EXPECT_EQ(NPN_SPDY_3, it->second.protocol);
 
   // GetAlternativeService should reorder the AlternateProtocol map.
   const AlternativeService alternative_service =
       impl_.GetAlternativeService(test_host_port_pair1);
   EXPECT_EQ(443, alternative_service.port);
   EXPECT_EQ(NPN_SPDY_3, alternative_service.protocol);
   it = map.begin();
   EXPECT_TRUE(it->first.Equals(test_host_port_pair1));
   EXPECT_EQ(443, it->second.port);
   EXPECT_EQ(NPN_SPDY_3, it->second.protocol);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, SetBroken) {
   HostPortPair test_host_port_pair("foo", 80);
-  impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
-  impl_.SetBrokenAlternateProtocol(test_host_port_pair);
+  const AlternativeService alternative_service1(NPN_SPDY_3, "foo", 443);
+  impl_.SetAlternativeService(test_host_port_pair, alternative_service1, 1.0);
+  impl_.MarkAlternativeServiceBroken(alternative_service1);
   ASSERT_TRUE(HasAlternativeService(test_host_port_pair));
-  const AlternativeService alternative_service(NPN_SPDY_3,
-                                               test_host_port_pair.host(), 443);
-  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
+  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service1));
 
-  impl_.SetAlternateProtocol(test_host_port_pair, 1234, NPN_SPDY_3, 1.0);
-  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
+  const AlternativeService alternative_service2(NPN_SPDY_3, "foo", 1234);
+  impl_.SetAlternativeService(test_host_port_pair, alternative_service2, 1.0);
+  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service1));
+  EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service2));
   EXPECT_EQ(1234, impl_.GetAlternativeService(test_host_port_pair).port);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearBroken) {
   HostPortPair test_host_port_pair("foo", 80);
-  impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
-  impl_.SetBrokenAlternateProtocol(test_host_port_pair);
+  const AlternativeService alternative_service(NPN_SPDY_3, "foo", 443);
+  impl_.SetAlternativeService(test_host_port_pair, alternative_service, 1.0);
+  impl_.MarkAlternativeServiceBroken(alternative_service);
   ASSERT_TRUE(HasAlternativeService(test_host_port_pair));
-  const AlternativeService alternative_service(NPN_SPDY_3,
-                                               test_host_port_pair.host(), 443);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
-  impl_.ClearAlternateProtocol(test_host_port_pair);
+  impl_.ClearAlternativeService(test_host_port_pair);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MarkRecentlyBroken) {
   HostPortPair host_port_pair("foo", 80);
-  impl_.SetAlternateProtocol(host_port_pair, 443, NPN_SPDY_4, 1.0);
+  const AlternativeService alternative_service(NPN_SPDY_4, "foo", 443);
+  impl_.SetAlternativeService(host_port_pair, alternative_service, 1.0);
 
-  const AlternativeService alternative_service(NPN_SPDY_4, "foo", 443);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
-  EXPECT_FALSE(impl_.WasAlternateProtocolRecentlyBroken(host_port_pair));
+  EXPECT_FALSE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 
   impl_.MarkAlternativeServiceRecentlyBroken(alternative_service);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
-  EXPECT_TRUE(impl_.WasAlternateProtocolRecentlyBroken(host_port_pair));
+  EXPECT_TRUE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 
-  impl_.ConfirmAlternateProtocol(host_port_pair);
+  impl_.ConfirmAlternativeService(alternative_service);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
-  EXPECT_FALSE(impl_.WasAlternateProtocolRecentlyBroken(host_port_pair));
+  EXPECT_FALSE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, Forced) {
   // Test forced alternate protocols.
 
   AlternateProtocolInfo default_protocol(1234, NPN_SPDY_3, 1);
   HttpServerPropertiesImpl::ForceAlternateProtocol(default_protocol);
 
   // Verify the forced protocol.
   HostPortPair test_host_port_pair("foo", 80);
   EXPECT_TRUE(HasAlternativeService(test_host_port_pair));
   AlternativeService alternative_service =
       impl_.GetAlternativeService(test_host_port_pair);
   EXPECT_EQ(default_protocol.port, alternative_service.port);
   EXPECT_EQ(default_protocol.protocol, alternative_service.protocol);
 
   // Verify the real protocol overrides the forced protocol.
-  impl_.SetAlternateProtocol(test_host_port_pair, 443, NPN_SPDY_3, 1.0);
+  alternative_service = AlternativeService(NPN_SPDY_3, "foo", 443);
+  impl_.SetAlternativeService(test_host_port_pair, alternative_service, 1.0);
   ASSERT_TRUE(HasAlternativeService(test_host_port_pair));
   alternative_service = impl_.GetAlternativeService(test_host_port_pair);
   EXPECT_EQ(443, alternative_service.port);
   EXPECT_EQ(NPN_SPDY_3, alternative_service.protocol);
 
   // Turn off the static, forced alternate protocol so that tests don't
   // have this state.
   HttpServerPropertiesImpl::DisableForcedAlternateProtocol();
 
   // Verify the forced protocol is off.
   HostPortPair test_host_port_pair2("bar", 80);
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair2));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, Canonical) {
   HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
 
   HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
   EXPECT_FALSE(HasAlternativeService(canonical_port_pair));
 
-  AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
-
-  impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
-                             canonical_protocol.protocol, 1.0);
+  AlternativeService canonical_altsvc(QUIC, "bar.c.youtube.com", 1234);
+  impl_.SetAlternativeService(canonical_port_pair, canonical_altsvc, 1.0);
   // Verify the forced protocol.
   ASSERT_TRUE(HasAlternativeService(test_host_port_pair));
   const AlternativeService alternative_service =
       impl_.GetAlternativeService(test_host_port_pair);
-  EXPECT_EQ(canonical_protocol.port, alternative_service.port);
-  EXPECT_EQ(canonical_protocol.protocol, alternative_service.protocol);
+  EXPECT_EQ(canonical_altsvc.port, alternative_service.port);
+  EXPECT_EQ(canonical_altsvc.protocol, alternative_service.protocol);
 
   // Verify the canonical suffix.
   EXPECT_EQ(".c.youtube.com",
             impl_.GetCanonicalSuffix(test_host_port_pair.host()));
   EXPECT_EQ(".c.youtube.com",
             impl_.GetCanonicalSuffix(canonical_port_pair.host()));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBelowThreshold) {
   impl_.SetAlternateProtocolProbabilityThreshold(0.02);
 
   HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
   HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
-  AlternateProtocolInfo canonical_protocol(1234, QUIC, 0.01);
+  AlternativeService canonical_altsvc(QUIC, "bar.c.youtube.com", 1234);
 
-  impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
-                             canonical_protocol.protocol,
-                             canonical_protocol.probability);
+  impl_.SetAlternativeService(canonical_port_pair, canonical_altsvc, 0.01);
   EXPECT_FALSE(HasAlternativeService(canonical_port_pair));
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, CanonicalAboveThreshold) {
   impl_.SetAlternateProtocolProbabilityThreshold(0.02);
 
   HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
   HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
-  AlternateProtocolInfo canonical_protocol(1234, QUIC, 0.03);
+  AlternativeService canonical_altsvc(QUIC, "bar.c.youtube.com", 1234);
 
-  impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
-                             canonical_protocol.protocol,
-                             canonical_protocol.probability);
+  impl_.SetAlternativeService(canonical_port_pair, canonical_altsvc, 0.03);
   EXPECT_TRUE(HasAlternativeService(canonical_port_pair));
   EXPECT_TRUE(HasAlternativeService(test_host_port_pair));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearCanonical) {
   HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
   HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
+  AlternativeService canonical_altsvc(QUIC, "bar.c.youtube.com", 1234);
 
-  AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
-
-  impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
-                             canonical_protocol.protocol,
-                             canonical_protocol.probability);
-
-  impl_.ClearAlternateProtocol(canonical_port_pair);
+  impl_.SetAlternativeService(canonical_port_pair, canonical_altsvc, 1.0);
+  impl_.ClearAlternativeService(canonical_port_pair);
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBroken) {
   HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
   HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
+  AlternativeService canonical_altsvc(QUIC, "bar.c.youtube.com", 1234);
 
-  AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
-
-  impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
-                             canonical_protocol.protocol,
-                             canonical_protocol.probability);
-
-  impl_.SetBrokenAlternateProtocol(canonical_port_pair);
+  impl_.SetAlternativeService(canonical_port_pair, canonical_altsvc, 1.0);
+  impl_.MarkAlternativeServiceBroken(canonical_altsvc);
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearWithCanonical) {
   HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
   HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
+  AlternativeService canonical_altsvc(QUIC, "bar.c.youtube.com", 1234);
 
-  AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
-
-  impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
-                             canonical_protocol.protocol,
-                             canonical_protocol.probability);
-
+  impl_.SetAlternativeService(canonical_port_pair, canonical_altsvc, 1.0);
   impl_.Clear();
   EXPECT_FALSE(HasAlternativeService(test_host_port_pair));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest,
        ExpireBrokenAlternateProtocolMappings) {
   HostPortPair host_port_pair("foo", 443);
   AlternativeService alternative_service(QUIC, "foo", 443);
-  impl_.SetAlternateProtocol(host_port_pair, 443, QUIC, 1.0);
+  impl_.SetAlternativeService(host_port_pair, alternative_service, 1.0);
   EXPECT_TRUE(HasAlternativeService(host_port_pair));
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
-  EXPECT_FALSE(impl_.WasAlternateProtocolRecentlyBroken(host_port_pair));
+  EXPECT_FALSE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 
   base::TimeTicks past =
       base::TimeTicks::Now() - base::TimeDelta::FromSeconds(42);
   HttpServerPropertiesImplPeer::AddBrokenAlternativeServiceWithExpirationTime(
       impl_, alternative_service, past);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
-  EXPECT_TRUE(impl_.WasAlternateProtocolRecentlyBroken(host_port_pair));
+  EXPECT_TRUE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 
   HttpServerPropertiesImplPeer::ExpireBrokenAlternateProtocolMappings(impl_);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
-  // TODO(bnc): Test WasAlternateProtocolRecentlyBroken once it's changed to
+  // TODO(bnc): Test WasAlternativeServiceRecentlyBroken once it's changed to
   // take AlternativeService as argument.
 }
 
 typedef HttpServerPropertiesImplTest SpdySettingsServerPropertiesTest;
 
 TEST_F(SpdySettingsServerPropertiesTest, Initialize) {
   HostPortPair spdy_server_google("www.google.com", 443);
 
   // Check by initializing empty spdy settings.
   SpdySettingsMap spdy_settings_map(SpdySettingsMap::NO_AUTO_EVICT);
@@ skipping 254 matching lines @@
   EXPECT_EQ(100, stats2->bandwidth_estimate.ToBitsPerSecond());
 
   impl_.Clear();
   const ServerNetworkStats* stats3 = impl_.GetServerNetworkStats(foo_server);
   EXPECT_EQ(NULL, stats3);
 }
 
 }  // namespace
 
 }  // namespace net