QuicChromiumClientStream should only do OnStream after notifying delegate about trailers

net/quic/quic_chromium_client_stream_test.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_chromium_client_stream.h"
 
 #include "base/macros.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/quic/quic_chromium_client_session.h"
@@ skipping 291 matching lines @@
   EXPECT_CALL(delegate_,
               OnHeadersAvailable(headers_, uncompressed_headers.length()));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(stream_->decompressed_headers().empty());
 
   const char data[] = "hello world!";
   stream_->OnStreamFrame(QuicStreamFrame(kTestStreamId, /*fin=*/false,
                                          /*offset=*/0, data));
 
   EXPECT_CALL(delegate_, OnDataAvailable())
+      .Times(1)
       .WillOnce(testing::Invoke(CreateFunctor(
           &QuicChromiumClientStreamTest::ReadData, base::Unretained(this),
           StringPiece(data, arraysize(data) - 1))));
 
+  // Wait until delegate_->OnDataAvailable is called.
+  base::MessageLoop::current()->RunUntilIdle();
+
   SpdyHeaderBlock trailers;
   trailers["bar"] = "foo";
   std::string uncompressed_trailers =
       SpdyUtils::SerializeUncompressedHeaders(trailers);
 
   stream_->OnStreamHeaders(uncompressed_trailers);
   stream_->OnStreamHeadersComplete(true, uncompressed_trailers.length());
 
   EXPECT_CALL(delegate_,
               OnHeadersAvailable(trailers, uncompressed_trailers.length()));
 
+  // Make sure that OnDataAvailable is invoked to force us to read FIN.
+  EXPECT_CALL(delegate_, OnDataAvailable())
+      .Times(1)
+      .WillOnce(testing::Invoke(
+          CreateFunctor(&QuicChromiumClientStreamTest::ReadData,
+                        base::Unretained(this), StringPiece(""))));
+
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_CALL(delegate_, OnClose(QUIC_NO_ERROR));
 }
 
 TEST_P(QuicChromiumClientStreamTest, WriteStreamData) {
   EXPECT_CALL(delegate_, OnClose(QUIC_NO_ERROR));
 
   const char kData1[] = "hello world";
   const size_t kDataLen = arraysize(kData1);
 
@@ skipping 48 matching lines @@
   stream->SetDelegate(&delegate_);
   base::MessageLoop::current()->RunUntilIdle();
 
   // Times(2) because OnClose will be called for stream and stream_.
   EXPECT_CALL(delegate_, OnClose(QUIC_NO_ERROR)).Times(2);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net