Land Recent QUIC Changes.

net/quic/quic_data_stream.h

 // Copyright 2013 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 streams which deliver data to/from an application.
 // In each direction, the data on such a stream first contains compressed
 // headers then body data.
 
 #ifndef NET_QUIC_QUIC_DATA_STREAM_H_
 #define NET_QUIC_QUIC_DATA_STREAM_H_
@@ skipping 91 matching lines @@
 
   void set_visitor(Visitor* visitor) { visitor_ = visitor; }
 
   bool headers_decompressed() const { return headers_decompressed_; }
 
   const IPEndPoint& GetPeerAddress();
 
   // Gets the SSL connection information.
   bool GetSSLInfo(SSLInfo* ssl_info);
 
-  // Override base class to enable flow control for data streams.
-  virtual bool IsFlowControlEnabled() const OVERRIDE;
-
  protected:
   // 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_; }
 
  private:
   friend class test::QuicDataStreamPeer;
@@ skipping 16 matching lines @@
   bool decompression_failed_;
   // True if the priority has been read, false otherwise.
   bool priority_parsed_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDataStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_DATA_STREAM_H_