Remove OnDataAvailable() notification when trailers are to be delivered

net/quic/chromium/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/chromium/quic_chromium_client_stream.h"
 
 #include <string>
 
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 399 matching lines @@
   SpdyHeaderBlock trailers;
   trailers["bar"] = "foo";
   trailers[kFinalOffsetHeaderKey] = base::IntToString(strlen(data));
   std::string uncompressed_trailers =
       SpdyUtils::SerializeUncompressedHeaders(trailers);
 
   stream_->OnStreamHeaders(uncompressed_trailers);
   stream_->OnStreamHeadersComplete(true, uncompressed_trailers.length());
   EXPECT_FALSE(stream_->IsDoneReading());
 
-  // Now the pending should complete. Make sure that IsDoneReading() is false
-  // even though ReadData returns 0 byte, because OnHeadersAvailable callback
-  // comes after this OnDataAvailable callback.
   base::RunLoop run_loop2;
-  EXPECT_CALL(delegate_, OnDataAvailable())
-      .Times(1)
-      .WillOnce(testing::DoAll(
-          testing::Invoke(CreateFunctor(&QuicChromiumClientStreamTest::ReadData,
-                                        base::Unretained(this), StringPiece())),
-          testing::InvokeWithoutArgs([&run_loop2]() { run_loop2.Quit(); })));
-  run_loop2.Run();
-  // Make sure that the stream is not closed, even though ReadData returns 0.
-  EXPECT_FALSE(stream_->IsDoneReading());
-
-  // The OnHeadersAvailable call should follow.
-  base::RunLoop run_loop3;
   EXPECT_CALL(delegate_,
               OnHeadersAvailableMock(_, uncompressed_trailers.length()))
       .WillOnce(
-          testing::InvokeWithoutArgs([&run_loop3]() { run_loop3.Quit(); }));
+          testing::InvokeWithoutArgs([&run_loop2]() { run_loop2.Quit(); }));
 
-  run_loop3.Run();
+  run_loop2.Run();
+
   // Make sure the stream is properly closed since trailers and data are all
   // consumed.
   EXPECT_TRUE(stream_->IsDoneReading());
   // Make sure kFinalOffsetHeaderKey is gone from the delivered actual trailers.
   trailers.erase(kFinalOffsetHeaderKey);
   EXPECT_EQ(trailers, delegate_.headers_);
 
   base::RunLoop().RunUntilIdle();
   EXPECT_CALL(delegate_, OnClose());
 }
@@ skipping 102 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(headers_, delegate_.headers_);
 
   // Times(2) because OnClose will be called for stream and stream_.
   EXPECT_CALL(delegate_, OnClose()).Times(2);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net