Deprecate FLAGS_reset_cubic_epoch_when_app_limited.

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 47796b3eb38d558bb2c3df5a6c1a7f0b5bc6fbe0..56e1a316d4399f3ff4d09aae50c53eda8d4237d3 100644
--- a/net/tools/quic/quic_server_bin.cc
+++ b/net/tools/quic/quic_server_bin.cc
@@ -35,8 +35,21 @@ net::ProofSource* CreateProofSource(const base::FilePath& cert_path,
   return new gfe_quic::ProofSourceGoogle3(ssl_ctx,
                                           /*take_ownership_of_ssl_ctx=*/true);
 =======
+<<<<<<<
+  CHECK(ssl_ctx->Init(
+      nullptr /* cert_loader */, NO_AUTHENTICATE_PEER, &config));
+|||||||
+  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));
+=======
+  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(NO_AUTHENTICATE_PEER, &config));
+>>>>>>>

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

This looks like a merge conflict. You'll want to make sure that the quic_server
quic_client epoll_quic_server and epoll_quic_client targets build.

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

Done.

 
   return new gfe_quic::ProofSourceGoogle3([=]() { return ssl_ctx; });
 >>>>>>>