Land Recent QUIC Changes.

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 996 matching lines @@
     if ((*it)->Matches(trans)) {
       delete *it;
       pending_queue.erase(it);
       return true;
     }
   }
   return false;
 }
 
 void HttpCache::SetupQuicServerInfoFactory(HttpNetworkSession* session) {
-  if (session && session->params().enable_quic_persist_server_info &&
+  if (session &&
       !session->quic_stream_factory()->has_quic_server_info_factory()) {
     DCHECK(!quic_server_info_factory_);
     quic_server_info_factory_.reset(new QuicServerInfoFactoryAdaptor(this));
     session->quic_stream_factory()->set_quic_server_info_factory(
         quic_server_info_factory_.get());
   }
 }
 
 void HttpCache::ProcessPendingQueue(ActiveEntry* entry) {
   // Multiple readers may finish with an entry at once, so we want to batch up
@@ skipping 171 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