Add an async ReadInitialHeaders method to QuicChromiumClientStream::Handle

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/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 26 matching lines @@
 namespace {
 
 const QuicStreamId kTestStreamId = 5u;
 
 class MockDelegate : public QuicChromiumClientStream::Delegate {
  public:
   MockDelegate() {}
 
   MOCK_METHOD0(OnSendData, int());
   MOCK_METHOD2(OnSendDataComplete, int(int, bool*));
-  void OnInitialHeadersAvailable(const SpdyHeaderBlock& headers,
-                                 size_t frame_len) override {
-    headers_ = headers.Clone();
-    OnInitialHeadersAvailableMock(headers, frame_len);
-  }
-  MOCK_METHOD2(OnInitialHeadersAvailableMock,
-               void(const SpdyHeaderBlock& headers, size_t frame_len));
   void OnTrailingHeadersAvailable(const SpdyHeaderBlock& headers,
                                   size_t frame_len) override {
     trailers_ = headers.Clone();
     OnTrailingHeadersAvailableMock(headers, frame_len);
   }
   MOCK_METHOD2(OnTrailingHeadersAvailableMock,
                void(const SpdyHeaderBlock& headers, size_t frame_len));
   MOCK_METHOD0(OnDataAvailable, void());
   MOCK_METHOD0(OnClose, void());
   MOCK_METHOD1(OnError, void(int));
@@ skipping 182 matching lines @@
   }
 
   QuicHeaderList ProcessTrailers(const SpdyHeaderBlock& headers) {
     QuicHeaderList h = AsHeaderList(headers);
     stream_->OnStreamHeaderList(true, h.uncompressed_header_bytes(), h);
     return h;
   }
 
   QuicHeaderList ProcessHeadersFull(const SpdyHeaderBlock& headers) {
     QuicHeaderList h = ProcessHeaders(headers);
-    EXPECT_CALL(delegate_, OnInitialHeadersAvailableMock(
-                               _, h.uncompressed_header_bytes()));
-    base::RunLoop().RunUntilIdle();
+    TestCompletionCallback callback;
+    EXPECT_EQ(
+        static_cast<int>(h.uncompressed_header_bytes()),
+        handle_->ReadInitialHeaders(&delegate_.headers_, callback.callback()));
     EXPECT_EQ(headers, delegate_.headers_);
     EXPECT_TRUE(stream_->header_list().empty());
     return h;
   }
 
   QuicStreamId GetNthClientInitiatedStreamId(int n) {
     return QuicSpdySessionPeer::GetNthClientInitiatedStreamId(session_, n);
   }
 
   QuicStreamId GetNthServerInitiatedStreamId(int n) {
@@ skipping 455 matching lines @@
 
   InitializeHeaders();
 
   // Receive the headers before the delegate is set.
   QuicHeaderList header_list = AsHeaderList(headers_);
   stream2->OnStreamHeaderList(true, header_list.uncompressed_header_bytes(),
                               header_list);
   EXPECT_TRUE(delegate2_.headers_.empty());
 
   // Now set the delegate and verify that the headers are delivered.
-  EXPECT_CALL(delegate2_, OnInitialHeadersAvailableMock(
-                              _, header_list.uncompressed_header_bytes()));
   handle2_ = stream2->CreateHandle(&delegate2_);
-  base::RunLoop().RunUntilIdle();
+  TestCompletionCallback callback;
+  EXPECT_EQ(
+      static_cast<int>(header_list.uncompressed_header_bytes()),
+      handle2_->ReadInitialHeaders(&delegate2_.headers_, callback.callback()));
   EXPECT_EQ(headers_, delegate2_.headers_);
 
   // Both delegates should be notified that theirs streams are closed.
   EXPECT_CALL(delegate2_, OnClose());
   EXPECT_CALL(delegate_, OnClose());
 }
 
 TEST_P(QuicChromiumClientStreamTest, HeadersAndDataBeforeDelegate) {
   // We don't use stream_ because we want an incoming server push
   // stream.
   QuicStreamId stream_id = GetNthServerInitiatedStreamId(0);
   QuicChromiumClientStream* stream2 =
       new QuicChromiumClientStream(stream_id, &session_, NetLogWithSource());
   session_.ActivateStream(base::WrapUnique(stream2));
 
   InitializeHeaders();
 
   // Receive the headers and data before the delegate is set.
   QuicHeaderList header_list = AsHeaderList(headers_);
   stream2->OnStreamHeaderList(false, header_list.uncompressed_header_bytes(),
                               header_list);
   EXPECT_TRUE(delegate2_.headers_.empty());
   const char data[] = "hello world!";
   stream2->OnStreamFrame(QuicStreamFrame(stream_id, /*fin=*/false,
                                          /*offset=*/0, data));
 
   // Now set the delegate and verify that the headers are delivered, but
   // not the data, which needs to be read explicitly.
-  EXPECT_CALL(delegate2_, OnInitialHeadersAvailableMock(
-                              _, header_list.uncompressed_header_bytes()));
   handle2_ = stream2->CreateHandle(&delegate2_);
-  base::RunLoop().RunUntilIdle();
+  TestCompletionCallback callback;
+  EXPECT_EQ(
+      static_cast<int>(header_list.uncompressed_header_bytes()),
+      handle2_->ReadInitialHeaders(&delegate2_.headers_, callback.callback()));
   EXPECT_EQ(headers_, delegate2_.headers_);
   base::RunLoop().RunUntilIdle();
 
   // Now explicitly read the data.
   int data_len = arraysize(data) - 1;
   scoped_refptr<IOBuffer> buffer(new IOBuffer(data_len + 1));
   ASSERT_EQ(data_len, stream2->Read(buffer.get(), data_len + 1));
   EXPECT_EQ(QuicStringPiece(data), QuicStringPiece(buffer->data(), data_len));
 
   // Both delegates should be notified that theirs streams are closed.
   EXPECT_CALL(delegate2_, OnClose());
   EXPECT_CALL(delegate_, OnClose());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net