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),
-      cookie_store_(cookie_store),
-      net_log_(new net::NetLog()) {
+      net_log_(new net::NetLog()),
+      cookie_store_(cookie_store) {

[pauljensen, 2015/09/02 14:32:29]

while we're reordering initialization here, can we move proxy_config_service_'s
initialization up to between net_log_ and cookie_store_ to match declaration
order?

[mmenke, 2015/09/02 16:29:33]

Done.

   proxy_config_service_ = config_service.Pass();
   http_user_agent_settings_.reset(
       new AwHttpUserAgentSettings());

[pauljensen, 2015/09/02 14:32:29]

nit: It's odd that some of these fields are initialized in the initializer list
and some are initialized in the function body.  Seems like
http_user_agent_settings_ initialization could be moved up to the initializer
list for more consistency.

[mmenke, 2015/09/02 16:29:33]

Done.

   // 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);
 
-  net::HttpCache* main_cache = new net::HttpCache(
-      network_session_params,
+  http_network_session_.reset(
+      new net::HttpNetworkSession(network_session_params));
+  main_http_factory_.reset(new net::HttpCache(
+      http_network_session_.get(),
       new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
           net::CACHE_BACKEND_SIMPLE,
           cache_path_,
           20 * 1024 * 1024,  // 20M
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)));
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE)),
+      true));

[pauljensen, 2015/09/02 14:32:29]

/* set_up_quic_server_info */

[mmenke, 2015/09/02 16:29:33]

Done.

 
-  main_http_factory_.reset(main_cache);
-  url_request_context_->set_http_transaction_factory(main_cache);
+  url_request_context_->set_http_transaction_factory(main_http_factory_.get());
 
   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());

[pauljensen, 2015/09/02 14:32:29]

one idea to simplify all this code a lot more would be to use a
URLRequestContextStorage, rather than defining scoped_ptr's for each thing that
goes into the Context.  maybe not for this CL.

[mmenke, 2015/09/02 16:29:33]

I'd really like to just switch to using URLRequestContextBuilder, actually.

Agree that it's beyond the scope of this CL, either way.

 }
 
 net::URLRequestContext* AwURLRequestContextGetter::GetURLRequestContext() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!url_request_context_)
     InitializeURLRequestContext();
 
   return url_request_context_.get();
 }
 
@@ skipping 13 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