QUIC proof source: allow construction with an |SSLContext| provider.

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 93e0fe21e1542af4308b3d23b001f150fe7375b9..47796b3eb38d558bb2c3df5a6c1a7f0b5bc6fbe0 100644
--- a/net/tools/quic/quic_server_bin.cc
+++ b/net/tools/quic/quic_server_bin.cc
@@ -25,8 +25,21 @@ int32 FLAGS_port = 6121;
 net::ProofSource* CreateProofSource(const base::FilePath& cert_path,
                                     const base::FilePath& key_path) {
   net::ProofSourceChromium* proof_source = new net::ProofSourceChromium();
+<<<<<<<
   CHECK(proof_source->Initialize(cert_path, key_path, base::FilePath()));
   return proof_source;
+|||||||
+  CHECK(ssl_ctx->Init(
+      nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config));
+
+  return new gfe_quic::ProofSourceGoogle3(ssl_ctx,
+                                          /*take_ownership_of_ssl_ctx=*/true);
+=======
+  CHECK(ssl_ctx->Init(
+      nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config));
+
+  return new gfe_quic::ProofSourceGoogle3([=]() { return ssl_ctx; });
+>>>>>>>

[Ryan Hamilton, 2015/11/19 20:14:15]

Merge conflict?

[ianswett, 2015/11/23 19:11:14]

Done.

 }
 
 int main(int argc, char *argv[]) {