Revert 204046 "Land Recent QUIC changes."

trunk/src/net/quic/reliable_quic_stream.cc

Index: trunk/src/net/quic/reliable_quic_stream.cc
===================================================================
--- trunk/src/net/quic/reliable_quic_stream.cc	(revision 204061)
+++ trunk/src/net/quic/reliable_quic_stream.cc	(working copy)
@@ -95,12 +95,7 @@
 
 void ReliableQuicStream::Close(QuicRstStreamErrorCode error) {
   stream_error_ = error;
-  if (error != QUIC_STREAM_NO_ERROR)  {
-    // Sending a RstStream results in calling CloseStream.
-    session()->SendRstStream(id(), error);
-  } else {
-    session_->CloseStream(id());
-  }
+  session()->SendRstStream(id(), error);
 }
 
 int ReliableQuicStream::Readv(const struct iovec* iov, size_t iov_len) {
@@ -160,7 +155,6 @@
 }
 
 QuicConsumedData ReliableQuicStream::WriteData(StringPiece data, bool fin) {
-  DCHECK(data.size() > 0 || fin);
   return WriteOrBuffer(data, fin);
 }
 
@@ -218,8 +212,6 @@
     if (fin && consumed_data.fin_consumed) {
       fin_sent_ = true;
       CloseWriteSide();
-    } else if (fin && !consumed_data.fin_consumed) {
-      session_->MarkWriteBlocked(id());
     }
   } else {
     session_->MarkWriteBlocked(id());