Revert of Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000

net/quic/quartc/quartc_session.cc

 // Copyright (c) 2017 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_session.h"
 
-#include "net/quic/platform/api/quic_ptr_util.h"
-
 using std::string;
 
 namespace net {
 
 namespace {
 
 // Default priority for incoming QUIC streams.
 // TODO(zhihuang): Determine if this value is correct.
 static const SpdyPriority kDefaultPriority = 3;
 
@@ skipping 249 matching lines @@
 
 QuicStream* QuartcSession::CreateIncomingDynamicStream(QuicStreamId id) {
   QuartcStream* stream = CreateDataStream(id, kDefaultPriority);
   if (stream) {
     DCHECK(session_delegate_);
     session_delegate_->OnIncomingStream(stream);
   }
   return stream;
 }
 
-std::unique_ptr<QuicStream> QuartcSession::CreateStream(QuicStreamId id) {
-  QuartcStream* stream = CreateDataStream(id, kDefaultPriority);
-  return QuicWrapUnique(stream);
-}
-
 QuartcStream* QuartcSession::CreateDataStream(QuicStreamId id,
                                               SpdyPriority priority) {
   if (crypto_stream_ == nullptr || !crypto_stream_->encryption_established()) {
     // Encryption not active so no stream created
     return nullptr;
   }
   QuartcStream* stream = new QuartcStream(id, this);
   if (stream) {
     // Make QuicSession take ownership of the stream.
     ActivateStream(std::unique_ptr<QuicStream>(stream));
     // Register the stream to the QuicWriteBlockedList. |priority| is clamped
     // between 0 and 7, with 0 being the highest priority and 7 the lowest
     // priority.
     write_blocked_streams()->RegisterStream(stream->id(), priority);
   }
   return stream;
 }
 
 }  // namespace net