Revert of Unify enum NextProto and enum AlternateProtocol.

net/spdy/spdy_http_stream.h

 // 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.
 
 #ifndef NET_SPDY_SPDY_HTTP_STREAM_H_
 #define NET_SPDY_SPDY_HTTP_STREAM_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 179 matching lines @@
   bool buffered_read_callback_pending_;
   // Has more data been received from the network during the wait for the
   // scheduled read callback.
   bool more_read_data_pending_;
 
   // Is this spdy stream direct to the origin server (or to a proxy).
   bool direct_;
 
   SSLInfo ssl_info_;
   bool was_alpn_negotiated_;
+  NextProto negotiated_protocol_;
 
   base::WeakPtrFactory<SpdyHttpStream> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyHttpStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_HTTP_STREAM_H_