DO NOT COMMIT: More hacks to get HTTP/2 working

net/spdy/spdy_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_stream.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 500 matching lines @@
     NOTREACHED();
     return;
   }
   if (IsClosed())
     return;
   just_completed_frame_type_ = frame_type;
   just_completed_frame_size_ = frame_size;
   DoLoop(OK);
 }
 
-int SpdyStream::GetProtocolVersion() const {
+SpdyMajorVersion SpdyStream::GetProtocolVersion() const {
   return session_->GetProtocolVersion();
 }
 
 void SpdyStream::LogStreamError(int status, const std::string& description) {
   net_log_.AddEvent(NetLog::TYPE_SPDY_STREAM_ERROR,
                     base::Bind(&NetLogSpdyStreamErrorCallback,
                                stream_id_, status, &description));
 }
 
 void SpdyStream::OnClose(int status) {
   CHECK(!in_do_loop_);
   io_state_ = STATE_CLOSED;
   response_status_ = status;
   Delegate* delegate = delegate_;
   delegate_ = NULL;
   if (delegate)
     delegate->OnClose(status);
   // Unset |stream_id_| last so that the delegate can look it up.
   stream_id_ = 0;
 }
 
 void SpdyStream::Cancel() {
   CHECK(!in_do_loop_);
   // We may be called again from a delegate's OnClose().
   if (io_state_ == STATE_CLOSED)
     return;
 
   if (stream_id_ != 0) {
-    session_->ResetStream(stream_id_, RST_STREAM_CANCEL, std::string());
+    session_->ResetStream(stream_id_, RST_STREAM_CANCEL, "Cancelling stream");
   } else {
     session_->CloseCreatedStream(GetWeakPtr(), RST_STREAM_CANCEL);
   }
   // |this| is invalid at this point.
 }
 
 void SpdyStream::Close() {
   CHECK(!in_do_loop_);
   // We may be called again from a delegate's OnClose().
   if (io_state_ == STATE_CLOSED)
@@ skipping 465 matching lines @@
       }
     } else if (weak_this) {
       response_headers_status_ = RESPONSE_HEADERS_ARE_COMPLETE;
     }
   }
 
   return OK;
 }
 
 }  // namespace net