Revert of Remove reference counting from HttpNetworkSession.

net/url_request/url_request_context_builder.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/url_request/url_request_context_builder.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 369 matching lines @@
       http_network_session_params_.use_alternative_services;
   network_session_params.trusted_spdy_proxy =
       http_network_session_params_.trusted_spdy_proxy;
   network_session_params.next_protos = http_network_session_params_.next_protos;
   network_session_params.enable_quic = http_network_session_params_.enable_quic;
   network_session_params.enable_insecure_quic =
       http_network_session_params_.enable_insecure_quic;
   network_session_params.quic_connection_options =
       http_network_session_params_.quic_connection_options;
 
-  storage->set_http_network_session(
-      make_scoped_ptr(new HttpNetworkSession(network_session_params)));
-
-  HttpTransactionFactory* http_transaction_factory;
+  HttpTransactionFactory* http_transaction_factory = NULL;
   if (http_cache_enabled_) {
-    HttpCache::BackendFactory* http_cache_backend;
+    HttpCache::BackendFactory* http_cache_backend = NULL;
     if (http_cache_params_.type == HttpCacheParams::DISK) {
       http_cache_backend = new HttpCache::DefaultBackend(
           DISK_CACHE, CACHE_BACKEND_DEFAULT, http_cache_params_.path,
           http_cache_params_.max_size, context->GetFileTaskRunner());
     } else {
       http_cache_backend =
           HttpCache::DefaultBackend::InMemory(http_cache_params_.max_size);
     }
 
-    http_transaction_factory = new HttpCache(storage->http_network_session(),
-                                             http_cache_backend, true);
+    http_transaction_factory = new HttpCache(
+        network_session_params, http_cache_backend);
   } else {
-    http_transaction_factory =
-        new HttpNetworkLayer(storage->http_network_session());
+    scoped_refptr<HttpNetworkSession> network_session(
+        new HttpNetworkSession(network_session_params));
+
+    http_transaction_factory = new HttpNetworkLayer(network_session.get());
   }
   storage->set_http_transaction_factory(http_transaction_factory);
 
   URLRequestJobFactoryImpl* job_factory = new URLRequestJobFactoryImpl;
   if (data_enabled_)
     job_factory->SetProtocolHandler("data",
                                     make_scoped_ptr(new DataProtocolHandler));
 
 #if !defined(DISABLE_FILE_SUPPORT)
   if (file_enabled_) {
@@ skipping 25 matching lines @@
     }
     url_request_interceptors_.weak_clear();
   }
   storage->set_job_factory(top_job_factory.release());
   // TODO(willchan): Support sdch.
 
   return context.Pass();
 }
 
 }  // namespace net