[SPDY] Refactor SpdyStream's handling of response headers

net/spdy/spdy_websocket_stream.h

 // 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.
 
 #ifndef NET_SPDY_SPDY_WEBSOCKET_STREAM_H_
 #define NET_SPDY_SPDY_WEBSOCKET_STREAM_H_
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 20 matching lines @@
    public:
     // Called when InitializeStream() finishes asynchronously. This delegate is
     // called if InitializeStream() returns ERR_IO_PENDING. |status| indicates
     // network error.
     virtual void OnCreatedSpdyStream(int status) = 0;
 
     // Called on corresponding to OnSendHeadersComplete() or SPDY's SYN frame
     // has been sent.
     virtual void OnSentSpdyHeaders() = 0;
 
-    // Called on corresponding to OnResponseHeadersReceived() or
+    // Called on corresponding to OnResponseHeadersUpdated() or
     // SPDY's SYN_STREAM, SYN_REPLY, or HEADERS frames are
     // received. This callback may be called multiple times as SPDY's
     // delegate does.
-    virtual int OnReceivedSpdyResponseHeader(
-        const SpdyHeaderBlock& headers,
-        int status) = 0;
+    virtual void OnSpdyResponseHeadersUpdated(
+        const SpdyHeaderBlock& response_headers) = 0;
 
     // Called when data is sent.
     virtual void OnSentSpdyData(size_t bytes_sent) = 0;
 
     // Called when data is received.
     virtual void OnReceivedSpdyData(scoped_ptr<SpdyBuffer> buffer) = 0;
 
     // Called when SpdyStream is closed.
     virtual void OnCloseSpdyStream() = 0;
 
@@ skipping 11 matching lines @@
   int InitializeStream(const GURL& url,
                        RequestPriority request_priority,
                        const BoundNetLog& stream_net_log);
 
   int SendRequest(scoped_ptr<SpdyHeaderBlock> headers);
   int SendData(const char* data, int length);
   void Close();
 
   // SpdyStream::Delegate
   virtual void OnRequestHeadersSent() OVERRIDE;
-  virtual int OnResponseHeadersReceived(const SpdyHeaderBlock& response,
-                                        base::Time response_time,
-                                        int status) OVERRIDE;
-  virtual int OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE;
+  virtual SpdyResponseHeadersStatus OnResponseHeadersUpdated(
+      const SpdyHeaderBlock& response_headers) OVERRIDE;
+  virtual void OnDataReceived(scoped_ptr<SpdyBuffer> buffer) OVERRIDE;
   virtual void OnDataSent() OVERRIDE;
   virtual void OnClose(int status) OVERRIDE;
 
  private:
   friend class SpdyWebSocketStreamSpdy2Test;
   friend class SpdyWebSocketStreamSpdy3Test;
   FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamSpdy2Test, Basic);
   FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamSpdy3Test, Basic);
 
   void OnSpdyStreamCreated(int status);
 
   base::WeakPtrFactory<SpdyWebSocketStream> weak_ptr_factory_;
   SpdyStreamRequest stream_request_;
   base::WeakPtr<SpdyStream> stream_;
   scoped_refptr<SpdySession> spdy_session_;
   size_t pending_send_data_length_;
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyWebSocketStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_WEBSOCKET_STREAM_H_