Remove reference counting from HttpNetworkSession.

android_webview/browser/net/aw_url_request_context_getter.cc

Index: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index def5f81e4de7ad17a13077ba0fc88162185aa9b4..16a103c1c44cdb0c5824dd16ff53bd2fdc4ece36 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -182,8 +182,8 @@ 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.

@@ -231,17 +231,19 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
   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());