Make QuicPacketCreator be able to serialize packet itself when it does not have room for next strea…

net/tools/quic/quic_server_bin.cc

 // Copyright 2014 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.
 //
 // A binary wrapper for QuicServer.  It listens forever on --port
 // (default 6121) until it's killed or ctrl-cd to death.
 
 #include <iostream>
 
 #include "base/at_exit.h"
@@ skipping 38 matching lines @@
   CHECK(ssl_ctx->Init(
       nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config));
 
   return new gfe_quic::ProofSourceGoogle3([=]() { return ssl_ctx; });
 }
 =======
   CHECK(ssl_ctx->Init(NO_AUTHENTICATE_PEER, &config));
 
   return new gfe_quic::ProofSourceGoogle3([=]() { return ssl_ctx; });
 }
+<<<<<<<
 >>>>>>>
 =======
   SSLContext* ssl_ctx = new SSLContext(
+|||||||
+  config.set_issuing_certificates_file(intermediate_cert_name);
+  config.add_cert()->set_name(leaf_cert_name);
+
+  SSLContext* ssl_ctx = new SSLContext(
+=======
+  config.set_issuing_certificates_file(intermediate_cert_name);
+  config.add_cert()->set_name(leaf_cert_name);
+
+  auto ssl_ctx = std::make_shared<SSLContext>(
+>>>>>>>

[Ryan Hamilton, 2015/11/22 00:55:32]

I think something has gone sideways...

[ianswett, 2015/11/23 20:05:19]

Done.

       SSLContext::SSL_SERVER_CONTEXT_SSL_V23,
       SSL_SESS_CACHE_SERVER | SSL_SESS_CACHE_NO_INTERNAL_STORE);
   CHECK(ssl_ctx->Init(NO_AUTHENTICATE_PEER, &config));
 >>>>>>>
 
   return new gfe_quic::ProofSourceGoogle3([=]() { return ssl_ctx; });
 >>>>>>>
 }
 
 int main(int argc, char *argv[]) {
@@ skipping 56 matching lines @@
 
   int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port));
   if (rc < 0) {
     return 1;
   }
 
   while (1) {
     server.WaitForEvents();
   }
 }