Revert of Remove reference counting from HttpNetworkSession.

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/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 276 matching lines @@
 
   QuicServerInfo* GetForServer(const QuicServerId& server_id) override {
     return new DiskCacheBasedQuicServerInfo(server_id, http_cache_);
   }
 
  private:
   HttpCache* const http_cache_;
 };
 
 //-----------------------------------------------------------------------------
+HttpCache::HttpCache(const HttpNetworkSession::Params& params,
+                     BackendFactory* backend_factory)
+    : net_log_(params.net_log),
+      backend_factory_(backend_factory),
+      building_backend_(false),
+      bypass_lock_for_test_(false),
+      fail_conditionalization_for_test_(false),
+      mode_(NORMAL),
+      network_layer_(new HttpNetworkLayer(new HttpNetworkSession(params))),
+      clock_(new base::DefaultClock()),
+      weak_factory_(this) {
+  SetupQuicServerInfoFactory(network_layer_->GetSession());
+}
+
+
 // This call doesn't change the shared |session|'s QuicServerInfoFactory because
 // |session| is shared.
 HttpCache::HttpCache(HttpNetworkSession* session,
-                     BackendFactory* backend_factory,
-                     bool set_up_quic_server_info)
-    : HttpCache(new HttpNetworkLayer(session),
-                session->net_log(),
-                backend_factory,
-                set_up_quic_server_info) {}
+                     BackendFactory* backend_factory)
+    : net_log_(session->net_log()),
+      backend_factory_(backend_factory),
+      building_backend_(false),
+      bypass_lock_for_test_(false),
+      fail_conditionalization_for_test_(false),
+      mode_(NORMAL),
+      network_layer_(new HttpNetworkLayer(session)),
+      clock_(new base::DefaultClock()),
+      weak_factory_(this) {
+}
 
 HttpCache::HttpCache(HttpTransactionFactory* network_layer,
                      NetLog* net_log,
-                     BackendFactory* backend_factory,
-                     bool set_up_quic_server_info)
+                     BackendFactory* backend_factory)
     : net_log_(net_log),
       backend_factory_(backend_factory),
       building_backend_(false),
       bypass_lock_for_test_(false),
       fail_conditionalization_for_test_(false),
       mode_(NORMAL),
       network_layer_(network_layer),
       clock_(new base::DefaultClock()),
       weak_factory_(this) {
-  if (set_up_quic_server_info)
-    SetupQuicServerInfoFactory(network_layer_->GetSession());
+  SetupQuicServerInfoFactory(network_layer_->GetSession());
 }
 
 HttpCache::~HttpCache() {
   // Transactions should see an invalid cache after this point; otherwise they
   // could see an inconsistent object (half destroyed).
   weak_factory_.InvalidateWeakPtrs();
 
   // If we have any active entries remaining, then we need to deactivate them.
   // We may have some pending calls to OnProcessPendingQueue, but since those
   // won't run (due to our destruction), we can simply ignore the corresponding
@@ skipping 831 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