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

net/tools/quic/quic_server_bin.cc

Index: net/tools/quic/quic_server_bin.cc
diff --git a/net/tools/quic/quic_server_bin.cc b/net/tools/quic/quic_server_bin.cc
index 7cb86cbc9b42967ee989c773f53a6caa6481737c..469fbd837357bcf656147921ab25e5966dd91868 100644
--- a/net/tools/quic/quic_server_bin.cc
+++ b/net/tools/quic/quic_server_bin.cc
@@ -56,9 +56,21 @@ net::ProofSource* CreateProofSource(const base::FilePath& cert_path,
 
   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));