Revert of Add IsAlternativeServiceBroken(), remove is_broken.

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 272 matching lines @@
   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(HasAlternateProtocol(test_host_port_pair1));
-  const AlternativeService alternative_service(
-      NPN_SPDY_3, test_host_port_pair1.host(), 443);
-  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
+  ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair2));
+  alternate = impl_.GetAlternateProtocol(test_host_port_pair1);
+  EXPECT_TRUE(alternate.is_broken);
   alternate = impl_.GetAlternateProtocol(test_host_port_pair2);
   EXPECT_EQ(123, alternate.port);
   EXPECT_EQ(NPN_SPDY_3, alternate.protocol);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MRUOfGetAlternateProtocol) {
   HostPortPair test_host_port_pair1("foo1", 80);
   impl_.SetAlternateProtocol(test_host_port_pair1, 443, NPN_SPDY_3, 1.0);
   HostPortPair test_host_port_pair2("foo2", 80);
   impl_.SetAlternateProtocol(test_host_port_pair2, 1234, NPN_SPDY_3, 1.0);
@@ skipping 13 matching lines @@
   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);
   ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair));
-  const AlternativeService alternative_service(NPN_SPDY_3,
-                                               test_host_port_pair.host(), 443);
-  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
+  AlternateProtocolInfo alternate =
+      impl_.GetAlternateProtocol(test_host_port_pair);
+  EXPECT_TRUE(alternate.is_broken);
 
   impl_.SetAlternateProtocol(test_host_port_pair, 1234, NPN_SPDY_3, 1.0);
-  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
-  const AlternateProtocolInfo alternate =
-      impl_.GetAlternateProtocol(test_host_port_pair);
-  EXPECT_EQ(1234, alternate.port);
+  alternate = impl_.GetAlternateProtocol(test_host_port_pair);
+  EXPECT_TRUE(alternate.is_broken) << "Second attempt should be ignored.";
 }
 
 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);
   ASSERT_TRUE(HasAlternateProtocol(test_host_port_pair));
-  const AlternativeService alternative_service(NPN_SPDY_3,
-                                               test_host_port_pair.host(), 443);
-  EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
+  AlternateProtocolInfo alternate =
+      impl_.GetAlternateProtocol(test_host_port_pair);
+  EXPECT_TRUE(alternate.is_broken);
   impl_.ClearAlternateProtocol(test_host_port_pair);
-  EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
+  EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
 }
 
 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);
@@ skipping 93 matching lines @@
   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);
   EXPECT_FALSE(HasAlternateProtocol(test_host_port_pair));
 }
 
+TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBroken2) {
+  HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
+  HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
+
+  AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
+
+  impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
+                             canonical_protocol.protocol,
+                             canonical_protocol.probability);
+
+  impl_.SetBrokenAlternateProtocol(test_host_port_pair);
+  AlternateProtocolInfo alternate =
+      impl_.GetAlternateProtocol(test_host_port_pair);
+  EXPECT_TRUE(alternate.is_broken);
+}
+
 TEST_F(AlternateProtocolServerPropertiesTest, ClearWithCanonical) {
   HostPortPair test_host_port_pair("foo.c.youtube.com", 80);
   HostPortPair canonical_port_pair("bar.c.youtube.com", 80);
 
   AlternateProtocolInfo canonical_protocol(1234, QUIC, 1);
 
   impl_.SetAlternateProtocol(canonical_port_pair, canonical_protocol.port,
                              canonical_protocol.protocol,
                              canonical_protocol.probability);
 
@@ skipping 265 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