Merge ReliableQuicStream::WriteData with

net/quic/reliable_quic_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.
 //
 // The base class for client/server reliable streams.
 
 #ifndef NET_QUIC_RELIABLE_QUIC_STREAM_H_
 #define NET_QUIC_RELIABLE_QUIC_STREAM_H_
 
 #include <sys/types.h>
@@ skipping 119 matching lines @@
   void set_visitor(Visitor* visitor) { visitor_ = visitor; }
 
   QuicSpdyCompressor* compressor();
 
   // Gets the SSL connection information.
   bool GetSSLInfo(SSLInfo* ssl_info);
 
   bool headers_decompressed() const { return headers_decompressed_; }
 
  protected:
-  // Returns a pair with the number of bytes consumed from data, and a boolean
-  // indicating if the fin bit was consumed.  This does not indicate the data
-  // has been sent on the wire: it may have been turned into a packet and queued
-  // if the socket was unexpectedly blocked.
-  //
-  // The default implementation always consumed all bytes and any fin, but
-  // this behavior is not guaranteed for subclasses so callers should check the
-  // return value.
-  virtual QuicConsumedData WriteData(base::StringPiece data, bool fin);
+  // Sends as much of 'data' to the connection as the connection will consume,
+  // and then buffers any remaining data in queued_data_.
+  void WriteOrBufferData(base::StringPiece data, bool fin);
+
+  // Sends as many bytes in the first |count| buffers of |iov| to the connection
+  // as the connection will consume.
+  // If |ack_notifier_delegate| is provided, then it will be notified once all
+  // the ACKs for this write have been received.
+  // Returns the number of bytes consumed by the connection.
+  QuicConsumedData WritevData(
+      const struct iovec* iov,
+      int iov_count,
+      bool fin,
+      QuicAckNotifier::DelegateInterface* ack_notifier_delegate);
 
   // Close the read side of the socket.  Further frames will not be accepted.
   virtual void CloseReadSide();
 
   // Close the write side of the socket.  Further writes will fail.
   void CloseWriteSide();
 
   bool HasBufferedData();
 
   bool fin_buffered() { return fin_buffered_; }
 
   QuicSession* session() { return session_; }
 
   // Sets priority_ to priority.  This should only be called before bytes are
   // written to the server.
   void set_priority(QuicPriority priority);
   // This is protected because external classes should use EffectivePriority
   // instead.
   QuicPriority priority() const { return priority_; }
 
-  // Sends as much of 'data' to the connection as the connection will consume,
-  // and then buffers any remaining data in queued_data_.
-  // Returns (data.size(), true) as it always consumed all data: it returns for
-  // convenience to have the same return type as WriteDataInternal.
-  QuicConsumedData WriteOrBuffer(base::StringPiece data, bool fin);
-
-  // Sends as much of 'data' to the connection as the connection will consume.
-  // Returns the number of bytes consumed by the connection.
-  QuicConsumedData WriteDataInternal(base::StringPiece data, bool fin);
-
-  // Sends as many bytes in the first |count| buffers of |iov| to the connection
-  // as the connection will consume.
-  // If |ack_notifier_delegate| is provided, then it will be notified once all
-  // the ACKs for this write have been received.
-  // Returns the number of bytes consumed by the connection.
-  QuicConsumedData WritevDataInternal(
-      const struct iovec* iov,
-      int iov_count,
-      bool fin,
-      QuicAckNotifier::DelegateInterface* ack_notifier_delegate);
-
  private:
   friend class test::ReliableQuicStreamPeer;
   friend class QuicStreamUtils;
 
   uint32 ProcessHeaderData();
 
   uint32 StripPriorityAndHeaderId(const char* data, uint32 data_len);
 
   std::list<string> queued_data_;
 
@@ skipping 39 matching lines @@
   bool fin_buffered_;
   bool fin_sent_;
 
   // True if the session this stream is running under is a server session.
   bool is_server_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_RELIABLE_QUIC_STREAM_H_