Revert of Unify enum NextProto and enum AlternateProtocol.

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 <memory>
 #include <string>
 #include <vector>
 
@@ skipping 229 matching lines @@
   url::SchemeHostPort spdy_server_mail("https", "mail.google.com", 443);
   EXPECT_FALSE(impl_.SupportsRequestPriority(spdy_server_mail));
 
   // Add docs.google.com:443 as supporting SPDY.
   url::SchemeHostPort spdy_server_docs("https", "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.
   url::SchemeHostPort youtube_server("https", "www.youtube.com", 443);
-  const AlternativeService alternative_service1(kProtoQUIC, "www.youtube.com",
-                                                443);
+  const AlternativeService alternative_service1(QUIC, "www.youtube.com", 443);
   SetAlternativeService(youtube_server, alternative_service1);
   EXPECT_TRUE(impl_.SupportsRequestPriority(youtube_server));
 
   // Add www.example.com:443 with two alternative services, one supporting QUIC.
   url::SchemeHostPort example_server("https", "www.example.com", 443);
-  const AlternativeService alternative_service2(kProtoHTTP2, "", 443);
+  const AlternativeService alternative_service2(NPN_HTTP_2, "", 443);
   SetAlternativeService(example_server, alternative_service2);
   SetAlternativeService(example_server, alternative_service1);
   EXPECT_TRUE(impl_.SupportsRequestPriority(example_server));
 
   // 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(youtube_server));
   EXPECT_TRUE(impl_.SupportsRequestPriority(example_server));
@@ skipping 108 matching lines @@
   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) {
   url::SchemeHostPort test_server("http", "foo", 80);
   EXPECT_FALSE(HasAlternativeService(test_server));
 
-  AlternativeService alternative_service(kProtoHTTP2, "foo", 443);
+  AlternativeService alternative_service(NPN_HTTP_2, "foo", 443);
   SetAlternativeService(test_server, alternative_service);
   const AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service, alternative_service_vector[0]);
 
   impl_.Clear();
   EXPECT_FALSE(HasAlternativeService(test_server));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ExcludeOrigin) {
   AlternativeServiceInfoVector alternative_service_info_vector;
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   // Same hostname, same port, TCP: should be ignored.
-  AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
+  AlternativeService alternative_service1(NPN_HTTP_2, "foo", 443);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service1, expiration));
   // Different hostname: GetAlternativeServices should return this one.
-  AlternativeService alternative_service2(kProtoHTTP2, "bar", 443);
+  AlternativeService alternative_service2(NPN_HTTP_2, "bar", 443);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service2, expiration));
   // Different port: GetAlternativeServices should return this one too.
-  AlternativeService alternative_service3(kProtoHTTP2, "foo", 80);
+  AlternativeService alternative_service3(NPN_HTTP_2, "foo", 80);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service3, expiration));
   // QUIC: GetAlternativeServices should return this one too.
-  AlternativeService alternative_service4(kProtoQUIC, "foo", 443);
+  AlternativeService alternative_service4(QUIC, "foo", 443);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service4, expiration));
 
   url::SchemeHostPort test_server("https", "foo", 443);
   impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
 
   const AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(3u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service2, alternative_service_vector[0]);
   EXPECT_EQ(alternative_service3, alternative_service_vector[1]);
   EXPECT_EQ(alternative_service4, alternative_service_vector[2]);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, Initialize) {
   // |test_server1| has an alternative service, which will not be
   // affected by InitializeAlternativeServiceServers(), because
   // |alternative_service_map| does not have an entry for
   // |test_server1|.
   url::SchemeHostPort test_server1("http", "foo1", 80);
-  const AlternativeService alternative_service1(kProtoHTTP2, "bar1", 443);
+  const AlternativeService alternative_service1(NPN_HTTP_2, "bar1", 443);
   const base::Time now = base::Time::Now();
   base::Time expiration1 = now + base::TimeDelta::FromDays(1);
   // 1st entry in the memory.
   impl_.SetAlternativeService(test_server1, alternative_service1, expiration1);
 
   // |test_server2| has an alternative service, which will be
   // overwritten by InitializeAlternativeServiceServers(), because
   // |alternative_service_map| has an entry for
   // |test_server2|.
   AlternativeServiceInfoVector alternative_service_info_vector;
-  const AlternativeService alternative_service2(kProtoHTTP2, "bar2", 443);
+  const AlternativeService alternative_service2(NPN_HTTP_2, "bar2", 443);
   base::Time expiration2 = now + base::TimeDelta::FromDays(2);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service2, expiration2));
   url::SchemeHostPort test_server2("http", "foo2", 80);
   // 0th entry in the memory.
   impl_.SetAlternativeServices(test_server2, alternative_service_info_vector);
 
   // Prepare |alternative_service_map| to be loaded by
   // InitializeAlternativeServiceServers().
   AlternativeServiceMap alternative_service_map(
       AlternativeServiceMap::NO_AUTO_EVICT);
-  const AlternativeService alternative_service3(kProtoHTTP2, "bar3", 123);
+  const AlternativeService alternative_service3(NPN_HTTP_2, "bar3", 123);
   base::Time expiration3 = now + base::TimeDelta::FromDays(3);
   const AlternativeServiceInfo alternative_service_info1(alternative_service3,
                                                          expiration3);
   // Simulate updating data for 0th entry with data from Preferences.
   alternative_service_map.Put(
       test_server2,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info1));
 
   url::SchemeHostPort test_server3("http", "foo3", 80);
-  const AlternativeService alternative_service4(kProtoHTTP2, "bar4", 1234);
+  const AlternativeService alternative_service4(NPN_HTTP_2, "bar4", 1234);
   base::Time expiration4 = now + base::TimeDelta::FromDays(4);
   const AlternativeServiceInfo alternative_service_info2(alternative_service4,
                                                          expiration4);
   // Add an old entry from Preferences, this will be added to end of recency
   // list.
   alternative_service_map.Put(
       test_server3,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info2));
 
   // MRU list will be test_server2, test_server1, test_server3.
@@ skipping 18 matching lines @@
   ASSERT_EQ(1u, map_it->second.size());
   EXPECT_EQ(alternative_service4, map_it->second[0].alternative_service);
   EXPECT_EQ(expiration4, map_it->second[0].expiration);
 }
 
 // Regression test for https://crbug.com/504032:
 // InitializeAlternativeServiceServers() should not crash if there is an empty
 // hostname is the mapping.
 TEST_F(AlternateProtocolServerPropertiesTest, InitializeWithEmptyHostname) {
   url::SchemeHostPort server("https", "foo", 443);
-  const AlternativeService alternative_service_with_empty_hostname(kProtoHTTP2,
+  const AlternativeService alternative_service_with_empty_hostname(NPN_HTTP_2,
                                                                    "", 1234);
-  const AlternativeService alternative_service_with_foo_hostname(kProtoHTTP2,
+  const AlternativeService alternative_service_with_foo_hostname(NPN_HTTP_2,
                                                                  "foo", 1234);
   SetAlternativeService(server, alternative_service_with_empty_hostname);
   impl_.MarkAlternativeServiceBroken(alternative_service_with_foo_hostname);
 
   AlternativeServiceMap alternative_service_map(
       AlternativeServiceMap::NO_AUTO_EVICT);
   impl_.InitializeAlternativeServiceServers(&alternative_service_map);
 
   EXPECT_TRUE(
       impl_.IsAlternativeServiceBroken(alternative_service_with_foo_hostname));
   const AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service_with_foo_hostname,
             alternative_service_vector[0]);
 }
 
 // Regression test for https://crbug.com/516486:
 // GetAlternativeServices() should remove |alternative_service_map_| elements
 // with empty value.
 TEST_F(AlternateProtocolServerPropertiesTest, EmptyVector) {
   url::SchemeHostPort server("https", "foo", 443);
-  const AlternativeService alternative_service(kProtoHTTP2, "bar", 443);
+  const AlternativeService alternative_service(NPN_HTTP_2, "bar", 443);
   base::Time expiration = base::Time::Now() - base::TimeDelta::FromDays(1);
   const AlternativeServiceInfo alternative_service_info(alternative_service,
                                                         expiration);
   AlternativeServiceMap alternative_service_map(
       AlternativeServiceMap::NO_AUTO_EVICT);
   alternative_service_map.Put(
       server,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
 
   // Prepare |alternative_service_map_| with a single key that has a single
@@ skipping 15 matching lines @@
 
   // There should still be no alternative service assigned to |server|.
   alternative_service_vector = impl_.GetAlternativeServices(server);
   ASSERT_TRUE(alternative_service_vector.empty());
 }
 
 // Regression test for https://crbug.com/516486 for the canonical host case.
 TEST_F(AlternateProtocolServerPropertiesTest, EmptyVectorForCanonical) {
   url::SchemeHostPort server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
-  const AlternativeService alternative_service(kProtoHTTP2, "", 443);
+  const AlternativeService alternative_service(NPN_HTTP_2, "", 443);
   base::Time expiration = base::Time::Now() - base::TimeDelta::FromDays(1);
   const AlternativeServiceInfo alternative_service_info(alternative_service,
                                                         expiration);
   AlternativeServiceMap alternative_service_map(
       AlternativeServiceMap::NO_AUTO_EVICT);
   alternative_service_map.Put(
       canonical_server,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
 
   // Prepare |alternative_service_map_| with a single key that has a single
@@ skipping 16 matching lines @@
 
   // There should still be no alternative service assigned to
   // |canonical_server|.
   alternative_service_vector = impl_.GetAlternativeServices(canonical_server);
   ASSERT_TRUE(alternative_service_vector.empty());
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearServerWithCanonical) {
   url::SchemeHostPort server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
-  const AlternativeService alternative_service(kProtoQUIC, "", 443);
+  const AlternativeService alternative_service(QUIC, "", 443);
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   const AlternativeServiceInfo alternative_service_info(alternative_service,
                                                         expiration);
 
   impl_.SetAlternativeServices(
       canonical_server,
       AlternativeServiceInfoVector(/*size=*/1, alternative_service_info));
 
   // Make sure the canonical service is returned for the other server.
   const AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(server);
   ASSERT_EQ(1u, alternative_service_vector.size());
-  EXPECT_EQ(kProtoQUIC, alternative_service_vector[0].protocol);
+  EXPECT_EQ(QUIC, alternative_service_vector[0].protocol);
   EXPECT_EQ(443, alternative_service_vector[0].port);
 
   // Now clear the alternatives for the other server and make sure it stays
   // cleared.
   // GetAlternativeServices() should remove this key from
   // |alternative_service_map_|, and SetAlternativeServices() should not crash.
   impl_.SetAlternativeServices(server, AlternativeServiceInfoVector());
 
   ASSERT_TRUE(impl_.GetAlternativeServices(server).empty());
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MRUOfGetAlternativeServices) {
   url::SchemeHostPort test_server1("http", "foo1", 80);
-  const AlternativeService alternative_service1(kProtoHTTP2, "foo1", 443);
+  const AlternativeService alternative_service1(NPN_HTTP_2, "foo1", 443);
   SetAlternativeService(test_server1, alternative_service1);
   url::SchemeHostPort test_server2("http", "foo2", 80);
-  const AlternativeService alternative_service2(kProtoHTTP2, "foo2", 1234);
+  const AlternativeService alternative_service2(NPN_HTTP_2, "foo2", 1234);
   SetAlternativeService(test_server2, alternative_service2);
 
   const AlternativeServiceMap& map = impl_.alternative_service_map();
   AlternativeServiceMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(test_server2));
   ASSERT_EQ(1u, it->second.size());
   EXPECT_EQ(alternative_service2, it->second[0].alternative_service);
 
   const AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(test_server1);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
 
   // GetAlternativeServices should reorder the AlternateProtocol map.
   it = map.begin();
   EXPECT_TRUE(it->first.Equals(test_server1));
   ASSERT_EQ(1u, it->second.size());
   EXPECT_EQ(alternative_service1, it->second[0].alternative_service);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, SetBroken) {
   url::SchemeHostPort test_server("http", "foo", 80);
-  const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
+  const AlternativeService alternative_service1(NPN_HTTP_2, "foo", 443);
   SetAlternativeService(test_server, alternative_service1);
   AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service1));
 
   // GetAlternativeServices should return the broken alternative service.
   impl_.MarkAlternativeServiceBroken(alternative_service1);
   alternative_service_vector = impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service1));
 
   // SetAlternativeServices should add a broken alternative service to the map.
   AlternativeServiceInfoVector alternative_service_info_vector;
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service1, expiration));
-  const AlternativeService alternative_service2(kProtoHTTP2, "foo", 1234);
+  const AlternativeService alternative_service2(NPN_HTTP_2, "foo", 1234);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service2, expiration));
   impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
   alternative_service_vector = impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(2u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
   EXPECT_EQ(alternative_service2, alternative_service_vector[1]);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service_vector[0]));
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service_vector[1]));
 
   // SetAlternativeService should add a broken alternative service to the map.
   SetAlternativeService(test_server, alternative_service1);
   alternative_service_vector = impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service1, alternative_service_vector[0]);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service_vector[0]));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MaxAge) {
   AlternativeServiceInfoVector alternative_service_info_vector;
   base::Time now = base::Time::Now();
   base::TimeDelta one_day = base::TimeDelta::FromDays(1);
 
   // First alternative service expired one day ago, should not be returned by
   // GetAlternativeServices().
-  const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
+  const AlternativeService alternative_service1(NPN_HTTP_2, "foo", 443);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service1, now - one_day));
 
   // Second alterrnative service will expire one day from now, should be
   // returned by GetAlternativeSerices().
-  const AlternativeService alternative_service2(kProtoHTTP2, "bar", 1234);
+  const AlternativeService alternative_service2(NPN_HTTP_2, "bar", 1234);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service2, now + one_day));
 
   url::SchemeHostPort test_server("http", "foo", 80);
   impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
 
   AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service2, alternative_service_vector[0]);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MaxAgeCanonical) {
   AlternativeServiceInfoVector alternative_service_info_vector;
   base::Time now = base::Time::Now();
   base::TimeDelta one_day = base::TimeDelta::FromDays(1);
 
   // First alternative service expired one day ago, should not be returned by
   // GetAlternativeServices().
-  const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
+  const AlternativeService alternative_service1(NPN_HTTP_2, "foo", 443);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service1, now - one_day));
 
   // Second alterrnative service will expire one day from now, should be
   // returned by GetAlternativeSerices().
-  const AlternativeService alternative_service2(kProtoHTTP2, "bar", 1234);
+  const AlternativeService alternative_service2(NPN_HTTP_2, "bar", 1234);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service2, now + one_day));
 
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
   impl_.SetAlternativeServices(canonical_server,
                                alternative_service_info_vector);
 
   url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
   AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(alternative_service2, alternative_service_vector[0]);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, AlternativeServiceWithScheme) {
   AlternativeServiceInfoVector alternative_service_info_vector;
-  const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
+  const AlternativeService alternative_service1(NPN_HTTP_2, "foo", 443);
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service1, expiration));
-  const AlternativeService alternative_service2(kProtoHTTP2, "bar", 1234);
+  const AlternativeService alternative_service2(NPN_HTTP_2, "bar", 1234);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service2, expiration));
   // Set Alt-Svc list for |http_server|.
   url::SchemeHostPort http_server("http", "foo", 80);
   impl_.SetAlternativeServices(http_server, alternative_service_info_vector);
 
   const net::AlternativeServiceMap& map = impl_.alternative_service_map();
   net::AlternativeServiceMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(http_server));
   ASSERT_EQ(2u, it->second.size());
@@ skipping 11 matching lines @@
 
   // Clear Alt-Svc list for |http_server|.
   impl_.SetAlternativeServices(http_server, AlternativeServiceInfoVector());
 
   EXPECT_EQ(0u, impl_.GetAlternativeServices(http_server).size());
   EXPECT_EQ(2u, impl_.GetAlternativeServices(https_server).size());
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearAlternativeServices) {
   AlternativeServiceInfoVector alternative_service_info_vector;
-  const AlternativeService alternative_service1(kProtoHTTP2, "foo", 443);
+  const AlternativeService alternative_service1(NPN_HTTP_2, "foo", 443);
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service1, expiration));
-  const AlternativeService alternative_service2(kProtoHTTP2, "bar", 1234);
+  const AlternativeService alternative_service2(NPN_HTTP_2, "bar", 1234);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(alternative_service2, expiration));
   url::SchemeHostPort test_server("http", "foo", 80);
   impl_.SetAlternativeServices(test_server, alternative_service_info_vector);
 
   const net::AlternativeServiceMap& map = impl_.alternative_service_map();
   net::AlternativeServiceMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(test_server));
   ASSERT_EQ(2u, it->second.size());
   EXPECT_EQ(alternative_service1, it->second[0].alternative_service);
   EXPECT_EQ(alternative_service2, it->second[1].alternative_service);
 
   impl_.SetAlternativeServices(test_server, AlternativeServiceInfoVector());
   EXPECT_TRUE(map.empty());
 }
 
 // A broken alternative service in the mapping carries meaningful information,
 // therefore it should not be ignored by SetAlternativeService().  In
 // particular, an alternative service mapped to an origin shadows alternative
 // services of canonical hosts.
 TEST_F(AlternateProtocolServerPropertiesTest, BrokenShadowsCanonical) {
   url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
-  AlternativeService canonical_alternative_service(kProtoQUIC,
-                                                   "bar.c.youtube.com", 1234);
+  AlternativeService canonical_alternative_service(QUIC, "bar.c.youtube.com",
+                                                   1234);
   SetAlternativeService(canonical_server, canonical_alternative_service);
   AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(canonical_alternative_service, alternative_service_vector[0]);
 
-  const AlternativeService broken_alternative_service(kProtoHTTP2, "foo", 443);
+  const AlternativeService broken_alternative_service(NPN_HTTP_2, "foo", 443);
   impl_.MarkAlternativeServiceBroken(broken_alternative_service);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(broken_alternative_service));
 
   SetAlternativeService(test_server, broken_alternative_service);
   alternative_service_vector = impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(broken_alternative_service, alternative_service_vector[0]);
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(broken_alternative_service));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearBroken) {
   url::SchemeHostPort test_server("http", "foo", 80);
-  const AlternativeService alternative_service(kProtoHTTP2, "foo", 443);
+  const AlternativeService alternative_service(NPN_HTTP_2, "foo", 443);
   SetAlternativeService(test_server, alternative_service);
   impl_.MarkAlternativeServiceBroken(alternative_service);
   ASSERT_TRUE(HasAlternativeService(test_server));
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
   // SetAlternativeServices should leave a broken alternative service marked
   // as such.
   impl_.SetAlternativeServices(test_server, AlternativeServiceInfoVector());
   EXPECT_TRUE(impl_.IsAlternativeServiceBroken(alternative_service));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, MarkRecentlyBroken) {
   url::SchemeHostPort server("http", "foo", 80);
-  const AlternativeService alternative_service(kProtoHTTP2, "foo", 443);
+  const AlternativeService alternative_service(NPN_HTTP_2, "foo", 443);
   SetAlternativeService(server, alternative_service);
 
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
   EXPECT_FALSE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 
   impl_.MarkAlternativeServiceRecentlyBroken(alternative_service);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
   EXPECT_TRUE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 
   impl_.ConfirmAlternativeService(alternative_service);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
   EXPECT_FALSE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, Canonical) {
   url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
   EXPECT_FALSE(HasAlternativeService(test_server));
 
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
   EXPECT_FALSE(HasAlternativeService(canonical_server));
 
   AlternativeServiceInfoVector alternative_service_info_vector;
   const AlternativeService canonical_alternative_service1(
-      kProtoQUIC, "bar.c.youtube.com", 1234);
+      QUIC, "bar.c.youtube.com", 1234);
   base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(canonical_alternative_service1, expiration));
-  const AlternativeService canonical_alternative_service2(kProtoHTTP2, "", 443);
+  const AlternativeService canonical_alternative_service2(NPN_HTTP_2, "", 443);
   alternative_service_info_vector.push_back(
       AlternativeServiceInfo(canonical_alternative_service2, expiration));
   impl_.SetAlternativeServices(canonical_server,
                                alternative_service_info_vector);
 
   // Since |test_server| does not have an alternative service itself,
   // GetAlternativeServices should return those of |canonical_server|.
   AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(test_server);
   ASSERT_EQ(2u, alternative_service_vector.size());
@@ skipping 10 matching lines @@
 
   // Verify the canonical suffix.
   EXPECT_EQ(".c.youtube.com", *impl_.GetCanonicalSuffix(test_server.host()));
   EXPECT_EQ(".c.youtube.com",
             *impl_.GetCanonicalSuffix(canonical_server.host()));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearCanonical) {
   url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
-  AlternativeService canonical_alternative_service(kProtoQUIC,
-                                                   "bar.c.youtube.com", 1234);
+  AlternativeService canonical_alternative_service(QUIC, "bar.c.youtube.com",
+                                                   1234);
 
   SetAlternativeService(canonical_server, canonical_alternative_service);
   impl_.SetAlternativeServices(canonical_server,
                                AlternativeServiceInfoVector());
   EXPECT_FALSE(HasAlternativeService(test_server));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, CanonicalBroken) {
   url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
-  AlternativeService canonical_alternative_service(kProtoQUIC,
-                                                   "bar.c.youtube.com", 1234);
+  AlternativeService canonical_alternative_service(QUIC, "bar.c.youtube.com",
+                                                   1234);
 
   SetAlternativeService(canonical_server, canonical_alternative_service);
   impl_.MarkAlternativeServiceBroken(canonical_alternative_service);
   EXPECT_FALSE(HasAlternativeService(test_server));
 }
 
 // Adding an alternative service for a new host overrides canonical host.
 TEST_F(AlternateProtocolServerPropertiesTest, CanonicalOverride) {
   url::SchemeHostPort foo_server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort bar_server("https", "bar.c.youtube.com", 443);
-  AlternativeService bar_alternative_service(kProtoQUIC, "bar.c.youtube.com",
-                                             1234);
+  AlternativeService bar_alternative_service(QUIC, "bar.c.youtube.com", 1234);
   SetAlternativeService(bar_server, bar_alternative_service);
   AlternativeServiceVector alternative_service_vector =
       impl_.GetAlternativeServices(foo_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(bar_alternative_service, alternative_service_vector[0]);
 
   url::SchemeHostPort qux_server("https", "qux.c.youtube.com", 443);
-  AlternativeService qux_alternative_service(kProtoQUIC, "qux.c.youtube.com",
-                                             443);
+  AlternativeService qux_alternative_service(QUIC, "qux.c.youtube.com", 443);
   SetAlternativeService(qux_server, qux_alternative_service);
   alternative_service_vector = impl_.GetAlternativeServices(foo_server);
   ASSERT_EQ(1u, alternative_service_vector.size());
   EXPECT_EQ(qux_alternative_service, alternative_service_vector[0]);
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest, ClearWithCanonical) {
   url::SchemeHostPort test_server("https", "foo.c.youtube.com", 443);
   url::SchemeHostPort canonical_server("https", "bar.c.youtube.com", 443);
-  AlternativeService canonical_alternative_service(kProtoQUIC,
-                                                   "bar.c.youtube.com", 1234);
+  AlternativeService canonical_alternative_service(QUIC, "bar.c.youtube.com",
+                                                   1234);
 
   SetAlternativeService(canonical_server, canonical_alternative_service);
   impl_.Clear();
   EXPECT_FALSE(HasAlternativeService(test_server));
 }
 
 TEST_F(AlternateProtocolServerPropertiesTest,
        ExpireBrokenAlternateProtocolMappings) {
   url::SchemeHostPort server("https", "foo", 443);
-  AlternativeService alternative_service(kProtoQUIC, "foo", 443);
+  AlternativeService alternative_service(QUIC, "foo", 443);
   SetAlternativeService(server, alternative_service);
   EXPECT_TRUE(HasAlternativeService(server));
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
   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_.WasAlternativeServiceRecentlyBroken(alternative_service));
 
   HttpServerPropertiesImplPeer::ExpireBrokenAlternateProtocolMappings(impl_);
   EXPECT_FALSE(impl_.IsAlternativeServiceBroken(alternative_service));
   EXPECT_TRUE(impl_.WasAlternativeServiceRecentlyBroken(alternative_service));
 }
 
 // Regression test for https://crbug.com/505413.
 TEST_F(AlternateProtocolServerPropertiesTest, RemoveExpiredBrokenAltSvc) {
   url::SchemeHostPort foo_server("https", "foo", 443);
-  AlternativeService bar_alternative_service(kProtoQUIC, "bar", 443);
+  AlternativeService bar_alternative_service(QUIC, "bar", 443);
   SetAlternativeService(foo_server, bar_alternative_service);
   EXPECT_TRUE(HasAlternativeService(foo_server));
 
   url::SchemeHostPort bar_server1("http", "bar", 80);
-  AlternativeService nohost_alternative_service(kProtoQUIC, "", 443);
+  AlternativeService nohost_alternative_service(QUIC, "", 443);
   SetAlternativeService(bar_server1, nohost_alternative_service);
   EXPECT_TRUE(HasAlternativeService(bar_server1));
 
   url::SchemeHostPort bar_server2("https", "bar", 443);
-  AlternativeService baz_alternative_service(kProtoQUIC, "baz", 1234);
+  AlternativeService baz_alternative_service(QUIC, "baz", 1234);
   SetAlternativeService(bar_server2, baz_alternative_service);
   EXPECT_TRUE(HasAlternativeService(bar_server2));
 
   // Mark "bar:443" as broken.
   base::TimeTicks past =
       base::TimeTicks::Now() - base::TimeDelta::FromSeconds(42);
   HttpServerPropertiesImplPeer::AddBrokenAlternativeServiceWithExpirationTime(
       impl_, bar_alternative_service, past);
 
   // Expire brokenness of "bar:443".
@@ skipping 523 matching lines @@
   EXPECT_EQ(quic_server_info1, *(impl_.GetQuicServerInfo(quic_server_id)));
 
   impl_.Clear();
   EXPECT_EQ(0u, impl_.quic_server_info_map().size());
   EXPECT_EQ(nullptr, impl_.GetQuicServerInfo(quic_server_id));
 }
 
 }  // namespace
 
 }  // namespace net