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

net/spdy/spdy_session.cc

Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 26ba059120cea61efee74d082c22a2e41201566d..a7f44a92f3952c25f3dfd4274ef6fd194c394ada 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -749,7 +749,7 @@ void SpdySession::AddPooledAlias(const SpdySessionKey& alias_key) {
   pooled_aliases_.insert(alias_key);
 }
 
-int SpdySession::GetProtocolVersion() const {
+SpdyMajorVersion SpdySession::GetProtocolVersion() const {
   DCHECK(buffered_spdy_framer_.get());
   return buffered_spdy_framer_->protocol_version();
 }
@@ -2238,7 +2238,7 @@ void SpdySession::OnRstStream(SpdyStreamId stream_id,
   ActiveStreamMap::iterator it = active_streams_.find(stream_id);
   if (it == active_streams_.end()) {
     // NOTE:  it may just be that the stream was cancelled.
-    LOG(WARNING) << "Received RST for invalid stream" << stream_id;
+    LOG(WARNING) << "Received RST for invalid stream " << stream_id;
     return;
   }
 
@@ -2300,7 +2300,9 @@ void SpdySession::OnPing(uint32 unique_id) {
 
   // Send response to a PING from server.
   if (unique_id % 2 == 0) {
-    WritePingFrame(unique_id);
+    // TODO(akalin): Reply to pings once we can distinguish them from
+    // pongs.
+    // WritePingFrame(unique_id);
     return;
   }
 
@@ -2345,12 +2347,15 @@ void SpdySession::OnWindowUpdate(SpdyStreamId stream_id,
     }
 
     if (delta_window_size < 1u) {
+      // TODO(akalin): Implement END_FLOW_CONTROL handling.
+      /*
       RecordProtocolErrorHistogram(PROTOCOL_ERROR_INVALID_WINDOW_UPDATE_SIZE);
       CloseSessionResult result = DoCloseSession(
           ERR_SPDY_PROTOCOL_ERROR,
           "Received WINDOW_UPDATE with an invalid delta_window_size " +
           base::UintToString(delta_window_size));
       DCHECK_EQ(result, SESSION_CLOSED_BUT_NOT_REMOVED);
+      */
       return;
     }