[Android] Fix AwSettingsTest AppCache test crashes.

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 "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_request_interceptor.h"
 #include "android_webview/browser/net/aw_network_delegate.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/browser/net/init_native_callback.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
+#include "net/http/http_cache.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/file_protocol_handler.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_context.h"
 
 using content::BrowserThread;
 
 namespace android_webview {
 
@@ skipping 58 matching lines @@
   builder.set_ftp_enabled(false);  // Android WebView does not support ftp yet.
   builder.set_proxy_config_service(proxy_config_service_.release());
   builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader(
       content::GetContentClient()->browser()->GetAcceptLangs(
           browser_context_)));
 
   // TODO(boliu): Values from chrome/app/resources/locale_settings_en-GB.xtb
   builder.set_accept_charset(
       net::HttpUtil::GenerateAcceptCharsetHeader("ISO-8859-1"));
 
-  net::URLRequestContextBuilder::HttpCacheParams cache_params;
-  cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::DISK;
-  cache_params.max_size = 10 * 1024 * 1024;  // 10M
-  cache_params.path =
-      browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cache")),

[boliu, 2012/12/06 15:36:39]

Unrelated: comma at the end of line...how did this ever compile?

[mnaganov (inactive), 2012/12/06 16:44:56]

That's http://en.wikipedia.org/wiki/Comma_operator ! C++ is a magic language.

[boliu, 2012/12/06 17:44:02]

Mind blown...

-  builder.EnableHttpCache(cache_params);
-
   url_request_context_.reset(builder.Build());
 
   job_factory_.reset(new AwURLRequestJobFactory);
   bool set_protocol = job_factory_->SetProtocolHandler(
       chrome::kFileScheme, new net::FileProtocolHandler());
   DCHECK(set_protocol);
   set_protocol = job_factory_->SetProtocolHandler(
       chrome::kDataScheme, new net::DataProtocolHandler());
   DCHECK(set_protocol);
   job_factory_->AddInterceptor(new AwRequestInterceptor());
   url_request_context_->set_job_factory(job_factory_.get());
 
+  net::HttpCache::DefaultBackend* main_backend =

[boliu, 2012/12/06 15:36:39]

Can we add a TODO or NOTE saying builder doesn't support AppCache yet so we have
to do this.

[mnaganov (inactive), 2012/12/06 16:44:56]

Done.

+      new net::HttpCache::DefaultBackend(
+          net::DISK_CACHE,
+          browser_context_->GetPath().Append(FILE_PATH_LITERAL("Cache")),
+          10 * 1024 * 1024,  // 10M
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
+  net::HttpNetworkSession::Params network_session_params;
+  PopulateNetworkSessionParams(&network_session_params);
+  net::HttpCache* main_cache = new net::HttpCache(
+      network_session_params, main_backend);
+  main_http_factory_.reset(main_cache);

[boliu, 2012/12/06 15:36:39]

nit: combine this line and above so we never declare a local raw pointer

[mnaganov (inactive), 2012/12/06 16:44:56]

Done.

+  url_request_context_->set_http_transaction_factory(main_cache);
+
   OnNetworkStackInitialized(url_request_context_.get(),
                             job_factory_.get());
 }
 
+void AwURLRequestContextGetter::PopulateNetworkSessionParams(
+    net::HttpNetworkSession::Params* params) {
+  net::URLRequestContext* context = url_request_context_.get();
+  params->host_resolver = context->host_resolver();
+  params->cert_verifier = context->cert_verifier();
+  params->server_bound_cert_service = context->server_bound_cert_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();
+}
+
 content::ResourceContext* AwURLRequestContextGetter::GetResourceContext() {
   DCHECK(url_request_context_);
   if (!resource_context_)
     resource_context_.reset(new AwResourceContext(url_request_context_.get()));
   return resource_context_.get();
 }
 
 net::URLRequestContext* AwURLRequestContextGetter::GetURLRequestContext() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return url_request_context_.get();
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 AwURLRequestContextGetter::GetNetworkTaskRunner() const {
   return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
 }
 
 }  // namespace android_webview