Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/quartc/quartc_stream_test.cc

 // Copyright (c) 2016 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.
 
 #include "net/quic/quartc/quartc_stream.h"
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/quic/core/crypto/quic_random.h"
 #include "net/quic/core/quic_session.h"
 #include "net/quic/core/quic_simple_buffer_allocator.h"
@@ skipping 19 matching lines @@
                   std::string* write_buffer)
       : QuicSession(connection, nullptr /*visitor*/, config),
         write_buffer_(write_buffer) {}
 
   // Writes outgoing data from QuicStream to a string.
   QuicConsumedData WritevData(
       QuicStream* stream,
       QuicStreamId id,
       QuicIOVector iovector,
       QuicStreamOffset offset,
-      bool fin,
+      StreamSendingState fin,
       QuicReferenceCountedPointer<
           QuicAckListenerInterface> /*ack_notifier_delegate*/) override {
     if (!writable_) {
       return QuicConsumedData(0, false);
     }
 
     const char* data = reinterpret_cast<const char*>(iovector.iov->iov_base);
     size_t len = iovector.total_length;
     write_buffer_->append(data, len);
-    return QuicConsumedData(len, fin);
+    return QuicConsumedData(len, fin != NO_FIN);
   }
 
   QuartcStream* CreateIncomingDynamicStream(QuicStreamId id) override {
     return nullptr;
   }
 
   QuartcStream* CreateOutgoingDynamicStream(SpdyPriority priority) override {
     return nullptr;
   }
 
-  QuicCryptoStream* GetCryptoStream() override { return nullptr; }
+  const QuicCryptoStream* GetCryptoStream() const override { return nullptr; }
+  QuicCryptoStream* GetMutableCryptoStream() override { return nullptr; }
 
   // Called by QuicStream when they want to close stream.
   void SendRstStream(QuicStreamId id,
                      QuicRstStreamErrorCode error,
                      QuicStreamOffset bytes_written) override {}
 
   // Sets whether data is written to buffer, or else if this is write blocked.
   void set_writable(bool writable) { writable_ = writable; }
 
   // Tracks whether the stream is write blocked and its priority.
@@ skipping 184 matching lines @@
 TEST_F(QuartcStreamTest, CloseStream) {
   CreateReliableQuicStream();
   EXPECT_FALSE(mock_stream_delegate_->closed());
   stream_->OnClose();
   EXPECT_TRUE(mock_stream_delegate_->closed());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net