Revert 253860 "Revert 253309 "QUIC - enable persisting of server..."

> Revert 253309 "QUIC - enable persisting of server config by wiring"
> 
> BUG=347476
> 
> > QUIC - enable persisting of server config by wiring
> > QuicServerInfoFactory object into HttpCache, HttpNetworkSession and
> > QuicStreamFactory.
> > 
> > R=wtc@chromium.org
> > 
> > Review URL: https://codereview.chromium.org/169643007
> 
> TBR=rtenneti@chromium.org
> 
> Review URL: https://codereview.chromium.org/181163003

TBR=rtenneti@chromium.org

Review URL: https://codereview.chromium.org/185053004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254276 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 13 insertions, 9 deletions

diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index f04df6d..ac9dda5 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -292,16 +292,20 @@ HttpCache::HttpCache(const net::HttpNetworkSession::Params& params,
       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());
 }
 
 
+// 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),
       mode_(NORMAL),
-      quic_server_info_factory_(new QuicServerInfoFactoryAdaptor(this)),
       network_layer_(new HttpNetworkLayer(session)) {
 }
 
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index e0650e6..75d3e18 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -61,7 +61,6 @@ HttpNetworkSession::Params::Params()
       transport_security_state(NULL),
       cert_transparency_verifier(NULL),
       proxy_service(NULL),
-      quic_server_info_factory(NULL),
       ssl_config_service(NULL),
       http_auth_handler_factory(NULL),
       network_delegate(NULL),
@@ -114,7 +113,6 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
                                params.client_socket_factory :
                                net::ClientSocketFactory::GetDefaultFactory(),
                            params.http_server_properties,
-                           params.quic_server_info_factory,
                            params.quic_crypto_client_stream_factory,
                            params.quic_random ? params.quic_random :
                                QuicRandom::GetInstance(),
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index b49e308..9be0e91 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -65,7 +65,6 @@ class NET_EXPORT HttpNetworkSession
     TransportSecurityState* transport_security_state;
     CTVerifier* cert_transparency_verifier;
     ProxyService* proxy_service;
-    QuicServerInfoFactory* quic_server_info_factory;
     std::string ssl_session_cache_shard;
     SSLConfigService* ssl_config_service;
     HttpAuthHandlerFactory* http_auth_handler_factory;
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 9e3eea2..63c5a71 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -6,7 +6,6 @@
 
 #include <set>
 
-#include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
@@ -276,7 +275,6 @@ QuicStreamFactory::QuicStreamFactory(
     HostResolver* host_resolver,
     ClientSocketFactory* client_socket_factory,
     base::WeakPtr<HttpServerProperties> http_server_properties,
-    QuicServerInfoFactory* quic_server_info_factory,
     QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory,
     QuicRandom* random_generator,
     QuicClock* clock,
@@ -288,7 +286,7 @@ QuicStreamFactory::QuicStreamFactory(
       host_resolver_(host_resolver),
       client_socket_factory_(client_socket_factory),
       http_server_properties_(http_server_properties),
-      quic_server_info_factory_(quic_server_info_factory),
+      quic_server_info_factory_(NULL),
       quic_crypto_client_stream_factory_(quic_crypto_client_stream_factory),
       random_generator_(random_generator),
       clock_(clock),
diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h
index 2b1cdea..33c9898 100644
--- a/net/quic/quic_stream_factory.h
+++ b/net/quic/quic_stream_factory.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
@@ -88,7 +89,6 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
       HostResolver* host_resolver,
       ClientSocketFactory* client_socket_factory,
       base::WeakPtr<HttpServerProperties> http_server_properties,
-      QuicServerInfoFactory* quic_server_info_factory,
       QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory,
       QuicRandom* random_generator,
       QuicClock* clock,
@@ -158,6 +158,12 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
 
   bool enable_port_selection() const { return enable_port_selection_; }
 
+  void set_quic_server_info_factory(
+      QuicServerInfoFactory* quic_server_info_factory) {
+    DCHECK(!quic_server_info_factory_);
+    quic_server_info_factory_ = quic_server_info_factory;
+  }
+
   bool enable_pacing() const { return enable_pacing_; }
 
  private:
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index c2ba455..c82fd23 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -77,7 +77,6 @@ class QuicStreamFactoryTest : public ::testing::TestWithParam<QuicVersion> {
         clock_(new MockClock()),
         factory_(&host_resolver_, &socket_factory_,
                  base::WeakPtr<HttpServerProperties>(),
-                 NULL,  // quic_server_info_factory
                  &crypto_client_stream_factory_,
                  &random_generator_, clock_, kDefaultMaxPacketSize,
                  SupportedVersions(GetParam()), true, true),