[Android WebView] Get rid of secondary 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 70 matching lines @@
   if (command_line.HasSwitch(switches::kTestingFixedHttpsPort)) {
     base::StringToInt(command_line.GetSwitchValueASCII(
         switches::kTestingFixedHttpsPort), &value);
     params->testing_fixed_https_port = value;
   }
   if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) {
     params->ignore_certificate_errors = true;
   }
 }
 
-void PopulateNetworkSessionParams(
-    net::URLRequestContext* context,
-    net::HttpNetworkSession::Params* params) {
-  params->host_resolver = context->host_resolver();
-  params->cert_verifier = context->cert_verifier();
-  params->channel_id_service = context->channel_id_service();
-  params->transport_security_state = context->transport_security_state();
-  params->proxy_service = context->proxy_service();
-  params->ssl_config_service = context->ssl_config_service();
-  params->http_auth_handler_factory = context->http_auth_handler_factory();
-  params->network_delegate = context->network_delegate();
-  params->http_server_properties = context->http_server_properties();
-  params->net_log = context->net_log();
-  // TODO(sgurun) remove once crbug.com/329681 is fixed.
-  params->next_protos = net::NextProtosSpdy31();
-  params->use_alternative_services = true;
-
-  ApplyCmdlineOverridesToNetworkSessionParams(params);
-}
-
 scoped_ptr<net::URLRequestJobFactory> CreateJobFactory(
     content::ProtocolHandlerMap* protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
   scoped_ptr<AwURLRequestJobFactory> aw_job_factory(new AwURLRequestJobFactory);
   // Note that the registered schemes must also be specified in
   // AwContentBrowserClient::IsHandledURL.
   bool set_protocol = aw_job_factory->SetProtocolHandler(
       url::kFileScheme,
       make_scoped_ptr(new net::FileProtocolHandler(
           content::BrowserThread::GetBlockingPool()
@@ skipping 92 matching lines @@
   builder.set_ftp_enabled(false);  // Android WebView does not support ftp yet.
 #endif
   DCHECK(proxy_config_service_.get());
   // Android provides a local HTTP proxy that handles all the proxying.
   // Create the proxy without a resolver since we rely on this local HTTP proxy.
   // TODO(sgurun) is this behavior guaranteed through SDK?
   builder.set_proxy_service(net::ProxyService::CreateWithoutProxyResolver(
       proxy_config_service_.Pass(), net_log_.get()));
   builder.set_net_log(net_log_.get());
   builder.SetCookieAndChannelIdStores(cookie_store_, NULL);
+
+  net::URLRequestContextBuilder::HttpCacheParams cache_params;
+  cache_params.type =
+      net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE;
+  cache_params.max_size = 20 * 1024 * 1024;  // 20M
+  cache_params.path = cache_path_;
+  builder.EnableHttpCache(cache_params);
+  builder.SetFileTaskRunner(
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
+
+  net::HttpNetworkSession::Params network_session_params;
+  ApplyCmdlineOverridesToNetworkSessionParams(&network_session_params);

[mmenke, 2015/11/17 17:22:45]

Bug:  This isn't doing anything.

You can set these using
URLRequestContextBuilder::set_http_network_session_params, though (Which takes
an URLRequestContextBuilder::NetworkSessionParams object).  It must be called
before builder.SetSpdyAndQuicEnabled, since they both touch the same internal
object.

[mnaganov (inactive), 2015/11/17 19:01:38]

*facepalm* Right, I knew I must call it, but somehow forgot to do that. Fixed.

+  builder.SetSpdyAndQuicEnabled(true, true);

[sgurun-gerrit only, 2015/11/17 08:19:12]

This makes me realize that... Quic is probably already enabled -- will verify
tomorrow.

[sgurun-gerrit only, 2015/11/17 18:06:31]

also as mmenke pointed out this enables http2, which is enabled only using field
trial experiments in chrome as far as I can tell. We don't have such support so
we should not do this, in my opinion. Of course let's see what Matt has to say
about it.

[mnaganov (inactive), 2015/11/17 19:01:39]

I confused use_alternative_services with Quic. The original code was setting the
former (in PopulateNetworkSessionParams).

   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(),
-      make_scoped_ptr(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 */));
-
-  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());
 }
 
 net::URLRequestContext* AwURLRequestContextGetter::GetURLRequestContext() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 19 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