Revert of Remove reference counting from HttpNetworkSession.

android_webview/browser/net/aw_url_request_context_getter.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 "android_webview/browser/net/aw_url_request_context_getter.h"
 
 #include <vector>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
@@ skipping 164 matching lines @@
 
   return job_factory.Pass();
 }
 
 }  // namespace
 
 AwURLRequestContextGetter::AwURLRequestContextGetter(
     const base::FilePath& cache_path, net::CookieStore* cookie_store,
     scoped_ptr<net::ProxyConfigService> config_service)
     : cache_path_(cache_path),
-      net_log_(new net::NetLog()),
-      proxy_config_service_(config_service.Pass()),
       cookie_store_(cookie_store),
-      http_user_agent_settings_(new AwHttpUserAgentSettings()) {
+      net_log_(new net::NetLog()) {
+  proxy_config_service_ = config_service.Pass();
+  http_user_agent_settings_.reset(
+      new AwHttpUserAgentSettings());
   // CreateSystemProxyConfigService for Android must be called on main thread.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 AwURLRequestContextGetter::~AwURLRequestContextGetter() {
 }
 
 void AwURLRequestContextGetter::InitializeURLRequestContext() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!url_request_context_);
@@ skipping 24 matching lines @@
   builder.SetCookieAndChannelIdStores(cookie_store_, NULL);
   ApplyCmdlineOverridesToURLRequestContextBuilder(&builder);
 
   url_request_context_ = builder.Build().Pass();
   // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
   net::HttpNetworkSession::Params network_session_params;
 
   PopulateNetworkSessionParams(url_request_context_.get(),
                                &network_session_params);
 
-  http_network_session_.reset(
-      new net::HttpNetworkSession(network_session_params));
-  main_http_factory_.reset(new net::HttpCache(
-      http_network_session_.get(),
+  net::HttpCache* main_cache = new net::HttpCache(
+      network_session_params,
       new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
           net::CACHE_BACKEND_SIMPLE,
           cache_path_,
           20 * 1024 * 1024,  // 20M
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)),
-      true /* set_up_quic_server_info */));
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
 
-  url_request_context_->set_http_transaction_factory(main_http_factory_.get());
+  main_http_factory_.reset(main_cache);
+  url_request_context_->set_http_transaction_factory(main_cache);
 
   job_factory_ = CreateJobFactory(&protocol_handlers_,
                                   request_interceptors_.Pass());
 
   job_factory_.reset(new net::URLRequestInterceptingJobFactory(
       job_factory_.Pass(),
       browser_context->GetDataReductionProxyIOData()->CreateInterceptor()));
   url_request_context_->set_job_factory(job_factory_.get());
   url_request_context_->set_http_user_agent_settings(
       http_user_agent_settings_.get());
@@ skipping 23 matching lines @@
   return net_log_.get();
 }
 
 void AwURLRequestContextGetter::SetKeyOnIO(const std::string& key) {
   DCHECK(AwBrowserContext::GetDefault()->GetDataReductionProxyIOData());
   AwBrowserContext::GetDefault()->GetDataReductionProxyIOData()->
       request_options()->SetKeyOnIO(key);
 }
 
 }  // namespace android_webview