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

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"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/proof_source_chromium.h"
 #include "net/quic/quic_protocol.h"
 #include "net/tools/quic/quic_in_memory_cache.h"
 #include "net/tools/quic/quic_server.h"
 
 // The port the quic server will listen on.
 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[]) {
   base::AtExitManager exit_manager;
   base::MessageLoopForIO message_loop;
 
   base::CommandLine::Init(argc, argv);
   base::CommandLine* line = base::CommandLine::ForCurrentProcess();
 
   logging::LoggingSettings settings;
@@ skipping 49 matching lines @@
 
   int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port));
   if (rc < 0) {
     return 1;
   }
 
   while (1) {
     server.WaitForEvents();
   }
 }