Revert of Unify enum NextProto and enum AlternateProtocol.

net/spdy/spdy_session_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/spdy/spdy_session.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/base64.h"
@@ skipping 5371 matching lines @@
                                            test_url_.EffectiveIntPort());
   AlternativeServiceVector altsvc_vector =
       spdy_session_pool_->http_server_properties()->GetAlternativeServices(
           session_origin);
   ASSERT_TRUE(altsvc_vector.empty());
 
   altsvc_vector =
       spdy_session_pool_->http_server_properties()->GetAlternativeServices(
           url::SchemeHostPort(GURL(origin)));
   ASSERT_EQ(1u, altsvc_vector.size());
-  EXPECT_EQ(kProtoQUIC, altsvc_vector[0].protocol);
+  EXPECT_EQ(QUIC, altsvc_vector[0].protocol);
   EXPECT_EQ("alternative.example.org", altsvc_vector[0].host);
   EXPECT_EQ(443u, altsvc_vector[0].port);
 }
 
 TEST_F(AltSvcFrameTest, DoNotProcessAltSvcFrameOnInsecureSession) {
   const char origin[] = "https://mail.example.org";
   SpdyAltSvcIR altsvc_ir(0);
   altsvc_ir.add_altsvc(alternative_service_);
   altsvc_ir.set_origin(origin);
   AddSocketData(altsvc_ir);
@@ skipping 104 matching lines @@
                                            test_url_.EffectiveIntPort());
   AlternativeServiceVector altsvc_vector =
       spdy_session_pool_->http_server_properties()->GetAlternativeServices(
           session_origin);
   ASSERT_TRUE(altsvc_vector.empty());
 
   altsvc_vector =
       spdy_session_pool_->http_server_properties()->GetAlternativeServices(
           url::SchemeHostPort(GURL(request_origin)));
   ASSERT_EQ(1u, altsvc_vector.size());
-  EXPECT_EQ(kProtoQUIC, altsvc_vector[0].protocol);
+  EXPECT_EQ(QUIC, altsvc_vector[0].protocol);
   EXPECT_EQ("alternative.example.org", altsvc_vector[0].host);
   EXPECT_EQ(443u, altsvc_vector[0].port);
 }
 
 TEST_F(AltSvcFrameTest, DoNotProcessAltSvcFrameOnStreamWithInsecureOrigin) {
   SpdyAltSvcIR altsvc_ir(1);
   altsvc_ir.add_altsvc(alternative_service_);
 
   SpdySerializedFrame altsvc_frame(spdy_util_.SerializeFrame(altsvc_ir));
   SpdySerializedFrame rst(
@@ skipping 290 matching lines @@
   ssl_info.cert = ImportCertFromFile(GetTestCertsDirectory(),
                                      "spdy_pooling.pem");
   ssl_info.is_issued_by_known_root = true;
   ssl_info.public_key_hashes.push_back(test::GetTestHashValue(primary_pin));
 
   EXPECT_TRUE(SpdySession::CanPool(
       &tss, ssl_info, "www.example.org", "mail.example.org"));
 }
 
 }  // namespace net