s/SYN_STREAM/HEADERS/ in frame types, method names, comments.

net/spdy/spdy_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_STREAM_H_
 #define NET_SPDY_SPDY_STREAM_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 273 matching lines @@
 
   // Returns true if the underlying transport socket ever had any reads or
   // writes.
   bool WasEverUsed() const;
 
   const BoundNetLog& net_log() const { return net_log_; }
 
   base::Time GetRequestTime() const;
   void SetRequestTime(base::Time t);
 
-  // Called at most once by the SpdySession when the initial response
-  // headers have been received for this stream, i.e., a SYN_REPLY (or
-  // SYN_STREAM for push streams) frame has been received. Returns a status
-  // code; if it is an error, the stream was closed by this function.
+  // Called at most once by the SpdySession when the initial response headers
+  // have been received for this stream. Returns a status code; if it is an
+  // error, the stream was closed by this function.
   int OnInitialResponseHeadersReceived(const SpdyHeaderBlock& response_headers,
                                        base::Time response_time,
                                        base::TimeTicks recv_first_byte_time);
 
   // Called by the SpdySession (only after
   // OnInitialResponseHeadersReceived() has been called) when
   // late-bound headers are received for a stream. Returns a status
   // code; if it is an error, the stream was closed by this function.
   int OnAdditionalResponseHeadersReceived(
       const SpdyHeaderBlock& additional_response_headers);
@@ skipping 18 matching lines @@
   // Called by the SpdySession when padding is consumed to allow for the stream
   // receiving window to be updated.
   void OnPaddingConsumed(size_t len);
 
   // Called by the SpdySession when a frame has been successfully and completely
   // written. |frame_size| is the total size of the logical frame in bytes,
   // including framing overhead.  For fragmented headers, this is the total size
   // of the HEADERS or PUSH_PROMISE frame and subsequent CONTINUATION frames.
   void OnFrameWriteComplete(SpdyFrameType frame_type, size_t frame_size);
 
-  // SYN_STREAM-specific write handler invoked by OnFrameWriteComplete().
+  // HEADERS-specific write handler invoked by OnFrameWriteComplete().
   int OnRequestHeadersSent();
 
   // DATA-specific write handler invoked by OnFrameWriteComplete().
   // If more data is already available to be written, the next write is
   // queued and ERR_IO_PENDING is returned. Returns OK otherwise.
   int OnDataSent(size_t frame_size);
 
   // Called by the SpdySession when the request is finished.  This callback
   // will always be called at the end of the request and signals to the
   // stream that the stream has no more network events.  No further callbacks
@@ skipping 78 matching lines @@
   int64_t raw_received_bytes() const { return raw_received_bytes_; }
   int64_t raw_sent_bytes() const { return raw_sent_bytes_; }
 
   bool GetLoadTimingInfo(LoadTimingInfo* load_timing_info) const;
 
   // Get the URL from the appropriate stream headers, or the empty
   // GURL() if it is unknown.
   const GURL& GetUrlFromHeaders() const { return url_from_header_block_; }
 
  private:
-  class SynStreamBufferProducer;
-  class HeaderBufferProducer;
+  class HeadersBufferProducer;
 
   // SpdyStream states and transitions are modeled
   // on the HTTP/2 stream state machine. All states and transitions
   // are modeled, with the exceptions of RESERVED_LOCAL (the client
   // cannot initate push streams), and the transition to OPEN due to
-  // a remote SYN_STREAM (the client can only initate streams).
+  // a remote HEADERS (the client can only initate streams).
   enum State {
     STATE_IDLE,
     STATE_OPEN,
     STATE_HALF_CLOSED_LOCAL_UNCLAIMED,
     STATE_HALF_CLOSED_LOCAL,
     STATE_HALF_CLOSED_REMOTE,
     STATE_RESERVED_REMOTE,
     STATE_CLOSED,
   };
 
   // Update the histograms.  Can safely be called repeatedly, but should only
   // be called after the stream has completed.
   void UpdateHistograms();
 
   // When a server-push stream is claimed by SetDelegate(), this function is
   // posted on the current MessageLoop to replay everything the server has sent.
   // From the perspective of SpdyStream's state machine, headers, data, and
   // FIN states received prior to the delegate being attached have not yet been
   // read. While buffered by |pending_recv_data_| it's not until
   // PushedStreamReplay() is invoked that reads are considered
   // to have occurred, driving the state machine forward.
   void PushedStreamReplay();
 
-  // Produces the SYN_STREAM frame for the stream. The stream must
+  // Produces the HEADERS frame for the stream. The stream must
   // already be activated.
-  std::unique_ptr<SpdySerializedFrame> ProduceSynStreamFrame();
+  std::unique_ptr<SpdySerializedFrame> ProduceHeadersFrame();
 
   // Queues the send for next frame of the remaining data in
   // |pending_send_data_|. Must be called only when
   // |pending_send_data_| is set.
   void QueueNextDataFrame();
 
   // Merge the given headers into |response_headers_| and calls
   // OnResponseHeadersUpdated() on the delegate (if attached).
   // Returns a status code; if it is an error, the stream was closed
   // by this function.
@@ skipping 88 matching lines @@
   bool write_handler_guard_;
 
   base::WeakPtrFactory<SpdyStream> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdyStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_STREAM_H_