Landing Recent QUIC changes until Mon Apr 17 2017

net/tools/quic/quic_simple_server_session.cc

 // 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.
 
 #include "net/tools/quic/quic_simple_server_session.h"
 
 #include <utility>
 
 #include "net/quic/core/proto/cached_network_parameters.pb.h"
 #include "net/quic/core/quic_connection.h"
-#include "net/quic/core/quic_flags.h"
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_logging.h"
 #include "net/quic/platform/api/quic_ptr_util.h"
 #include "net/tools/quic/quic_simple_server_stream.h"
 
 using std::string;
 
 namespace net {
 
 QuicSimpleServerSession::QuicSimpleServerSession(
     const QuicConfig& config,
@@ skipping 179 matching lines @@
     QUIC_DLOG(INFO) << "created server push stream " << promised_stream->id();
 
     SpdyHeaderBlock request_headers(std::move(promised_info.request_headers));
 
     promised_streams_.pop_front();
     promised_stream->PushResponse(std::move(request_headers));
   }
 }
 
 }  // namespace net