These packets got reformatted at some point, maybe before the clang-format off annotation was added.

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 56e1a316d4399f3ff4d09aae50c53eda8d4237d3..7cb86cbc9b42967ee989c773f53a6caa6481737c 100644
--- a/net/tools/quic/quic_server_bin.cc
+++ b/net/tools/quic/quic_server_bin.cc
@@ -42,8 +42,21 @@ net::ProofSource* CreateProofSource(const base::FilePath& cert_path,
   SSLContext* ssl_ctx = new SSLContext(
       SSLContext::SSL_SERVER_CONTEXT_SSL_V23,
       SSL_SESS_CACHE_SERVER | SSL_SESS_CACHE_NO_INTERNAL_STORE);
+<<<<<<<
+  CHECK(ssl_ctx->Init(
+      nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config));
+|||||||
   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; });
+}
+>>>>>>>

[Ryan Hamilton, 2015/11/22 00:54:41]

More merge conflicts?

[ianswett, 2015/11/23 20:04:50]

Done.

 =======
   SSLContext* ssl_ctx = new SSLContext(
       SSLContext::SSL_SERVER_CONTEXT_SSL_V23,