Disallow multiple HEADERS frames on pushed streams.

net/spdy/spdy_stream_test_util.cc

Index: net/spdy/spdy_stream_test_util.cc
diff --git a/net/spdy/spdy_stream_test_util.cc b/net/spdy/spdy_stream_test_util.cc
index 9b250b2f074d7e15905262c958bfe69fca7237d1..9bef50af8135206f79673792be1accbfbcea5ea3 100644
--- a/net/spdy/spdy_stream_test_util.cc
+++ b/net/spdy/spdy_stream_test_util.cc
@@ -23,12 +23,10 @@ ClosingDelegate::ClosingDelegate(
 
 ClosingDelegate::~ClosingDelegate() {}
 
-void ClosingDelegate::OnRequestHeadersSent() {}
+void ClosingDelegate::OnHeadersSent() {}
 
-SpdyResponseHeadersStatus ClosingDelegate::OnResponseHeadersUpdated(
-    const SpdyHeaderBlock& response_headers) {
-  return RESPONSE_HEADERS_ARE_COMPLETE;
-}
+void ClosingDelegate::OnHeadersReceived(
+    const SpdyHeaderBlock& response_headers) {}
 
 void ClosingDelegate::OnDataReceived(std::unique_ptr<SpdyBuffer> buffer) {}
 
@@ -52,17 +50,16 @@ StreamDelegateBase::StreamDelegateBase(
 StreamDelegateBase::~StreamDelegateBase() {
 }
 
-void StreamDelegateBase::OnRequestHeadersSent() {
+void StreamDelegateBase::OnHeadersSent() {
   stream_id_ = stream_->stream_id();
   EXPECT_NE(stream_id_, 0u);
   send_headers_completed_ = true;
 }
 
-SpdyResponseHeadersStatus StreamDelegateBase::OnResponseHeadersUpdated(
+void StreamDelegateBase::OnHeadersReceived(
     const SpdyHeaderBlock& response_headers) {
   EXPECT_EQ(stream_->type() != SPDY_PUSH_STREAM, send_headers_completed_);
   response_headers_ = response_headers.Clone();
-  return RESPONSE_HEADERS_ARE_COMPLETE;
 }
 
 void StreamDelegateBase::OnDataReceived(std::unique_ptr<SpdyBuffer> buffer) {
@@ -121,15 +118,13 @@ StreamDelegateSendImmediate::StreamDelegateSendImmediate(
 StreamDelegateSendImmediate::~StreamDelegateSendImmediate() {
 }
 
-SpdyResponseHeadersStatus StreamDelegateSendImmediate::OnResponseHeadersUpdated(
+void StreamDelegateSendImmediate::OnHeadersReceived(
     const SpdyHeaderBlock& response_headers) {
-  SpdyResponseHeadersStatus status =
-      StreamDelegateBase::OnResponseHeadersUpdated(response_headers);
+  StreamDelegateBase::OnHeadersReceived(response_headers);
   if (data_.data()) {
     scoped_refptr<StringIOBuffer> buf(new StringIOBuffer(data_.as_string()));
     stream()->SendData(buf.get(), buf->size(), MORE_DATA_TO_SEND);
   }
-  return status;
 }
 
 StreamDelegateWithBody::StreamDelegateWithBody(
@@ -141,8 +136,8 @@ StreamDelegateWithBody::StreamDelegateWithBody(
 StreamDelegateWithBody::~StreamDelegateWithBody() {
 }
 
-void StreamDelegateWithBody::OnRequestHeadersSent() {
-  StreamDelegateBase::OnRequestHeadersSent();
+void StreamDelegateWithBody::OnHeadersSent() {
+  StreamDelegateBase::OnHeadersSent();
   stream()->SendData(buf_.get(), buf_->size(), NO_MORE_DATA_TO_SEND);
 }
 
@@ -154,11 +149,9 @@ StreamDelegateCloseOnHeaders::StreamDelegateCloseOnHeaders(
 StreamDelegateCloseOnHeaders::~StreamDelegateCloseOnHeaders() {
 }
 
-SpdyResponseHeadersStatus
-StreamDelegateCloseOnHeaders::OnResponseHeadersUpdated(
+void StreamDelegateCloseOnHeaders::OnHeadersReceived(
     const SpdyHeaderBlock& response_headers) {
   stream()->Cancel();
-  return RESPONSE_HEADERS_ARE_COMPLETE;
 }
 
 } // namespace test