Avoid persisting of QUIC server config information in Stable and Beta

net/http/http_cache.cc

Index: net/http/http_cache.cc
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index ac9dda5b517a74d6414798408ab93edd14ae447b..fdf40e42350e06204161af1d968e163b074f815d 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -290,11 +290,13 @@ HttpCache::HttpCache(const net::HttpNetworkSession::Params& params,
       backend_factory_(backend_factory),
       building_backend_(false),
       mode_(NORMAL),
-      quic_server_info_factory_(new QuicServerInfoFactoryAdaptor(this)),
       network_layer_(new HttpNetworkLayer(new HttpNetworkSession(params))) {
-  HttpNetworkSession* session = network_layer_->GetSession();
-  session->quic_stream_factory()->set_quic_server_info_factory(
-      quic_server_info_factory_.get());
+  if (params.enable_quic_persist_server_info) {
+    quic_server_info_factory_.reset(new QuicServerInfoFactoryAdaptor(this));

[Ryan Hamilton, 2014/03/01 00:38:27]

nit: if you wanted to make quic_server_info_factory_ const, I think you could
still do that by using the ?: operator in the initializer list:

quic_server_info_factory_(
  params.enable_quic_persist_server_info ? 
    new QuicServerInfoFactoryAdaptor(this)) :
    NULL);

(or some such... or you could extract this logic to a function)

[ramant (doing other things), 2014/03/01 01:22:22]

Done.

+    HttpNetworkSession* session = network_layer_->GetSession();
+    session->quic_stream_factory()->set_quic_server_info_factory(
+        quic_server_info_factory_.get());
+  }
 }