Revert of Unify enum NextProto and enum AlternateProtocol.

net/spdy/spdy_http_stream.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_http_stream.h"
 
 #include <algorithm>
 #include <list>
 #include <utility>
 
@@ skipping 32 matching lines @@
       closed_stream_sent_bytes_(0),
       request_info_(NULL),
       response_info_(NULL),
       response_headers_status_(RESPONSE_HEADERS_ARE_INCOMPLETE),
       user_buffer_len_(0),
       request_body_buf_size_(0),
       buffered_read_callback_pending_(false),
       more_read_data_pending_(false),
       direct_(direct),
       was_alpn_negotiated_(false),
+      negotiated_protocol_(kProtoUnknown),
       weak_factory_(this) {
   DCHECK(spdy_session_.get());
 }
 
 SpdyHttpStream::~SpdyHttpStream() {
   if (stream_.get()) {
     stream_->DetachDelegate();
     DCHECK(!stream_.get());
   }
 }
@@ skipping 379 matching lines @@
                         weak_factory_.GetWeakPtr()));
 
   if (rv != ERR_IO_PENDING)
     OnRequestBodyReadCompleted(rv);
 }
 
 void SpdyHttpStream::InitializeStreamHelper() {
   stream_->SetDelegate(this);
   stream_->GetSSLInfo(&ssl_info_);
   was_alpn_negotiated_ = stream_->WasNpnNegotiated();
+  negotiated_protocol_ = stream_->GetNegotiatedProtocol();
 }
 
 void SpdyHttpStream::ResetStreamInternal() {
   spdy_session_->ResetStream(stream()->stream_id(), RST_STREAM_INTERNAL_ERROR,
                              std::string());
 }
 
 void SpdyHttpStream::OnRequestBodyReadCompleted(int status) {
   if (status < 0) {
     DCHECK_NE(ERR_IO_PENDING, status);
@@ skipping 150 matching lines @@
   details->connection_info = HttpResponseInfo::CONNECTION_INFO_HTTP2;
   return;
 }
 
 void SpdyHttpStream::SetPriority(RequestPriority priority) {
   // TODO(akalin): Plumb this through to |stream_request_| and
   // |stream_|.
 }
 
 }  // namespace net