Avoid persisting of QUIC server config information in Stable and Beta

net/http/http_cache.cc

 // Copyright (c) 2012 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.
 
 #include "net/http/http_cache.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 
@@ skipping 272 matching lines @@
   HttpCache* const http_cache_;
 };
 
 //-----------------------------------------------------------------------------
 HttpCache::HttpCache(const net::HttpNetworkSession::Params& params,
                      BackendFactory* backend_factory)
     : net_log_(params.net_log),
       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());
+  }
 }
 
 
 // This call doesn't change the shared |session|'s QuicServerInfoFactory because
 // |session| is shared.
 HttpCache::HttpCache(HttpNetworkSession* session,
                      BackendFactory* backend_factory)
     : net_log_(session->net_log()),
       backend_factory_(backend_factory),
       building_backend_(false),
@@ skipping 863 matching lines @@
     building_backend_ = false;
     DeletePendingOp(pending_op);
   }
 
   // The cache may be gone when we return from the callback.
   if (!item->DoCallback(result, disk_cache_.get()))
     item->NotifyTransaction(result, NULL);
 }
 
 }  // namespace net