[SPDY] Refactor SpdyStream's handling of response headers

net/spdy/spdy_stream_test_util.h

Index: net/spdy/spdy_stream_test_util.h
diff --git a/net/spdy/spdy_stream_test_util.h b/net/spdy/spdy_stream_test_util.h
index 364153606e04f9e3bf3984257f6243049a240516..3cc519d979ea0a26b960d381ec20843c0b0ae93d 100644
--- a/net/spdy/spdy_stream_test_util.h
+++ b/net/spdy/spdy_stream_test_util.h
@@ -27,9 +27,8 @@ class ClosingDelegate : public SpdyStream::Delegate {
 
   // SpdyStream::Delegate implementation.
   virtual void OnRequestHeadersSent() OVERRIDE;
-  virtual int OnResponseHeadersReceived(const SpdyHeaderBlock& response,
-                                        base::Time response_time,
-                                        int status) OVERRIDE;
+  virtual int OnResponseHeadersUpdated(
+      const SpdyHeaderBlock& response_headers) OVERRIDE;
   virtual int OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE;
   virtual void OnDataSent() OVERRIDE;
   virtual void OnClose(int status) OVERRIDE;
@@ -49,9 +48,8 @@ class StreamDelegateBase : public SpdyStream::Delegate {
   virtual ~StreamDelegateBase();
 
   virtual void OnRequestHeadersSent() OVERRIDE;
-  virtual int OnResponseHeadersReceived(const SpdyHeaderBlock& response,
-                                        base::Time response_time,
-                                        int status) OVERRIDE;
+  virtual int OnResponseHeadersUpdated(
+      const SpdyHeaderBlock& response_headers) OVERRIDE;
   virtual int OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE;
   virtual void OnDataSent() OVERRIDE;
   virtual void OnClose(int status) OVERRIDE;
@@ -94,7 +92,7 @@ class StreamDelegateDoNothing : public StreamDelegateBase {
   virtual ~StreamDelegateDoNothing();
 };
 
-// Test delegate that sends data immediately in OnResponseHeadersReceived().
+// Test delegate that sends data immediately in OnResponseHeadersUpdated().
 class StreamDelegateSendImmediate : public StreamDelegateBase {
  public:
   // |data| can be NULL.
@@ -102,9 +100,8 @@ class StreamDelegateSendImmediate : public StreamDelegateBase {
                               base::StringPiece data);
   virtual ~StreamDelegateSendImmediate();
 
-  virtual int OnResponseHeadersReceived(const SpdyHeaderBlock& response,
-                                        base::Time response_time,
-                                        int status) OVERRIDE;
+  virtual int OnResponseHeadersUpdated(
+      const SpdyHeaderBlock& response_headers) OVERRIDE;
 
  private:
   base::StringPiece data_;