Revert of Remove reference counting from HttpNetworkSession.

chrome/browser/profiles/profile_io_data.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 "chrome/browser/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 48 matching lines @@
 #include "components/sync_driver/pref_names.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
 #include "net/base/keygen_handler.h"
 #include "net/base/network_quality_estimator.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cookies/canonical_cookie.h"
-#include "net/http/http_network_session.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/http/http_util.h"
 #include "net/http/transport_security_persister.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/proxy/proxy_script_fetcher_impl.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/client_cert_store.h"
 #include "net/url_request/certificate_report_sender.h"
 #include "net/url_request/data_protocol_handler.h"
@@ skipping 1215 matching lines @@
 
 void ProfileIOData::set_channel_id_service(
     net::ChannelIDService* channel_id_service) const {
   channel_id_service_.reset(channel_id_service);
 }
 
 void ProfileIOData::DestroyResourceContext() {
   resource_context_.reset();
 }
 
-scoped_ptr<net::HttpNetworkSession> ProfileIOData::CreateHttpNetworkSession(
-    const ProfileParams& profile_params) const {
+scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory(
+    const ProfileParams* profile_params,
+    net::HttpCache::BackendFactory* main_backend) const {
   net::HttpNetworkSession::Params params;
   net::URLRequestContext* context = main_request_context();
 
-  IOThread* const io_thread = profile_params.io_thread;
+  IOThread* const io_thread = profile_params->io_thread;
 
   io_thread->InitializeNetworkSessionParams(&params);
   net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(context,
                                                                  &params);
 
   params.ssl_session_cache_shard = GetSSLSessionCacheShard();
   params.socket_performance_watcher_factory =
       io_thread->globals()->network_quality_estimator.get();
   if (data_reduction_proxy_io_data_.get())
     params.proxy_delegate = data_reduction_proxy_io_data_->proxy_delegate();
 
-  return scoped_ptr<net::HttpNetworkSession>(
-      new net::HttpNetworkSession(params));
-}
-
-scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory(
-    net::HttpNetworkSession* session,
-    net::HttpCache::BackendFactory* main_backend) const {
-  net::URLRequestContext* context = main_request_context();
+  net::HttpNetworkSession* session = new net::HttpNetworkSession(params);
   return scoped_ptr<net::HttpCache>(new net::HttpCache(
       new DevToolsNetworkTransactionFactory(
           network_controller_handle_.GetController(), session),
-      context->net_log(), main_backend,
-      true /* set_up_quic_server_info */));
+      context->net_log(), main_backend));
 }
 
 scoped_ptr<net::HttpCache> ProfileIOData::CreateHttpFactory(
     net::HttpNetworkSession* shared_session,
     net::HttpCache::BackendFactory* backend) const {
   return scoped_ptr<net::HttpCache>(new net::HttpCache(
       new DevToolsNetworkTransactionFactory(
           network_controller_handle_.GetController(), shared_session),
-      shared_session->net_log(), backend,
-      true /* set_up_quic_server_info */));
+      shared_session->net_log(), backend));
 }
 
 void ProfileIOData::SetCookieSettingsForTesting(
     content_settings::CookieSettings* cookie_settings) {
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }