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

net/spdy/spdy_stream.cc

Index: net/spdy/spdy_stream.cc
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index a603a6c93e089f758e0e05fa3c121a4a3db88e4e..c6a3ddc96fc067456a0ee108197d23bf361ec9f9 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -518,7 +518,7 @@ void SpdyStream::OnFrameWriteComplete(SpdyFrameType frame_type,
   DoLoop(OK);
 }
 
-int SpdyStream::GetProtocolVersion() const {
+SpdyMajorVersion SpdyStream::GetProtocolVersion() const {
   return session_->GetProtocolVersion();
 }
 
@@ -547,7 +547,7 @@ void SpdyStream::Cancel() {
     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);
   }