[SPDY] Refactor SpdyStream's handling of response headers

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 8024f8fcafa7dd4c09ac975d8c64749029adc903..63cb59297055761ab6a20957b5ff66636a8ca2e5 100644
--- a/net/spdy/spdy_stream_test_util.cc
+++ b/net/spdy/spdy_stream_test_util.cc
@@ -22,9 +22,8 @@ ClosingDelegate::~ClosingDelegate() {}
 
 void ClosingDelegate::OnRequestHeadersSent() {}
 
-int ClosingDelegate::OnResponseHeadersReceived(const SpdyHeaderBlock& response,
-                                               base::Time response_time,
-                                               int status) {
+int ClosingDelegate::OnResponseHeadersUpdated(
+    const SpdyHeaderBlock& response_headers) {
   return OK;
 }
 
@@ -56,13 +55,11 @@ void StreamDelegateBase::OnRequestHeadersSent() {
   send_headers_completed_ = true;
 }
 
-int StreamDelegateBase::OnResponseHeadersReceived(
-    const SpdyHeaderBlock& response,
-    base::Time response_time,
-    int status) {
+int StreamDelegateBase::OnResponseHeadersUpdated(
+    const SpdyHeaderBlock& response_headers) {
   EXPECT_TRUE(send_headers_completed_);
-  response_ = response;
-  return status;
+  response_ = response_headers;
+  return OK;
 }
 
 int StreamDelegateBase::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {
@@ -120,13 +117,9 @@ StreamDelegateSendImmediate::StreamDelegateSendImmediate(
 StreamDelegateSendImmediate::~StreamDelegateSendImmediate() {
 }
 
-int StreamDelegateSendImmediate::OnResponseHeadersReceived(
-    const SpdyHeaderBlock& response,
-    base::Time response_time,
-    int status) {
-  status =
-      StreamDelegateBase::OnResponseHeadersReceived(
-          response, response_time, status);
+int StreamDelegateSendImmediate::OnResponseHeadersUpdated(
+    const SpdyHeaderBlock& response_headers) {
+  int status = StreamDelegateBase::OnResponseHeadersUpdated(response_headers);
   if (data_.data()) {
     scoped_refptr<StringIOBuffer> buf(new StringIOBuffer(data_.as_string()));
     stream()->SendData(buf.get(), buf->size(), MORE_DATA_TO_SEND);