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

net/quic/chromium/quic_chromium_client_session.cc

Index: net/quic/chromium/quic_chromium_client_session.cc
diff --git a/net/quic/chromium/quic_chromium_client_session.cc b/net/quic/chromium/quic_chromium_client_session.cc
index 5f4495381010ca95cfb3d1ada1b468f7d1b722eb..cd123b19de48d537ea0477a194e63ba669259869 100644
--- a/net/quic/chromium/quic_chromium_client_session.cc
+++ b/net/quic/chromium/quic_chromium_client_session.cc
@@ -31,7 +31,6 @@
 #include "net/quic/chromium/quic_stream_factory.h"
 #include "net/quic/core/quic_client_promised_info.h"
 #include "net/quic/core/spdy_utils.h"
-#include "net/quic/platform/api/quic_ptr_util.h"
 #include "net/socket/datagram_client_socket.h"
 #include "net/spdy/chromium/spdy_http_utils.h"
 #include "net/spdy/chromium/spdy_log_util.h"
@@ -504,11 +503,6 @@
       static_cast<base::HistogramBase::Sample>(stats.max_sequence_reordering));
 }
 
-std::unique_ptr<QuicStream> QuicChromiumClientSession::CreateStream(
-    QuicStreamId id) {
-  return QuicMakeUnique<QuicChromiumClientStream>(id, this, net_log_);
-}
-
 void QuicChromiumClientSession::Initialize() {
   QuicClientSessionBase::Initialize();
   SetHpackEncoderDebugVisitor(