Landing Recent QUIC changes until 8/4/2015 20:30 UTC.

net/quic/quic_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/quic/quic_http_stream.h"
 
 #include "base/callback_helpers.h"
 #ifdef TEMP_INSTRUMENTATION_468529
 #include "base/debug/alias.h"
 #endif
@@ skipping 519 matching lines @@
   response_info_->request_time = request_time_;
   response_headers_received_ = true;
 
   return OK;
 }
 
 int QuicHttpStream::ReadAvailableData(IOBuffer* buf, int buf_len) {
   int rv = stream_->Read(buf, buf_len);
   if (stream_->IsDoneReading()) {
     stream_->SetDelegate(nullptr);
-    stream_->DoneReading();
+    stream_->OnFinRead();
     stream_ = nullptr;
   }
   return rv;
 }
 
 SpdyMajorVersion QuicHttpStream::GetSpdyVersion() {
   return SpdyUtils::GetSpdyVersionForQuicVersion(stream_->version());
 }
 
 void QuicHttpStream::CrashIfInvalid() const {
 #ifdef TEMP_INSTRUMENTATION_468529
   Liveness liveness = liveness_;
 
   if (liveness == ALIVE)
     return;
 
   // Copy relevant variables onto the stack to guarantee they will be available
   // in minidumps, and then crash.
   base::debug::StackTrace stack_trace = stack_trace_;
 
   base::debug::Alias(&liveness);
   base::debug::Alias(&stack_trace);
 
   CHECK_EQ(ALIVE, liveness);
 #endif
 }
 
 }  // namespace net