Switch to using URLRequestContextBuilder to create some URLRequestContexts.

mojo/services/network/network_context.cc

Index: mojo/services/network/network_context.cc
diff --git a/mojo/services/network/network_context.cc b/mojo/services/network/network_context.cc
index 7c777aaddf3f372db45076e5b6a4dccd46128510..da57f5fdc20da42243db0fc1b37655d329cb9745 100644
--- a/mojo/services/network/network_context.cc
+++ b/mojo/services/network/network_context.cc
@@ -6,109 +6,29 @@
 
 #include "base/base_paths.h"
 #include "base/path_service.h"
-#include "net/cert/cert_verifier.h"
-#include "net/cookies/cookie_monster.h"
-#include "net/http/http_cache.h"
-#include "net/http/http_network_session.h"
-#include "net/http/http_server_properties_impl.h"
-#include "net/http/transport_security_persister.h"
-#include "net/http/transport_security_state.h"
 #include "net/proxy/proxy_service.h"
-#include "net/ssl/default_server_bound_cert_store.h"
-#include "net/ssl/server_bound_cert_service.h"
-#include "net/ssl/ssl_config_service_defaults.h"
-#include "net/url_request/file_protocol_handler.h"
-#include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_storage.h"
-#include "net/url_request/url_request_job_factory_impl.h"
+#include "net/url_request/url_request_context_builder.h"
 
 namespace mojo {
 
-NetworkContext::NetworkContext(const base::FilePath& base_path)
-    : file_thread_("network_file_thread"),
-      cache_thread_("network_cache_thread") {
-  file_thread_.Start();
-
-  base::Thread::Options options;
-  options.message_loop_type = base::MessageLoop::TYPE_IO;
-  cache_thread_.StartWithOptions(options);
-
-  url_request_context_.reset(new net::URLRequestContext());
-  url_request_context_->set_net_log(net_log_.get());
-
-  storage_.reset(
-      new net::URLRequestContextStorage(url_request_context_.get()));
-
-  storage_->set_cookie_store(new net::CookieMonster(NULL, NULL));
-
+NetworkContext::NetworkContext(const base::FilePath& base_path) {
+  net::URLRequestContextBuilder builder;
+  builder.set_accept_language("en-us,en");
   // TODO(darin): This is surely the wrong UA string.
-  storage_->set_http_user_agent_settings(
-      new net::StaticHttpUserAgentSettings("en-us,en", "Mojo/0.1"));
-
-  storage_->set_proxy_service(net::ProxyService::CreateDirect());
-  storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
-  storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
-
-  net::TransportSecurityState* transport_security_state =
-      new net::TransportSecurityState();
-  storage_->set_transport_security_state(transport_security_state);
-
-  transport_security_persister_.reset(
-      new net::TransportSecurityPersister(
-          transport_security_state,
-          base_path,
-          file_thread_.message_loop_proxy(),
-          false));
-
-  storage_->set_server_bound_cert_service(
-      new net::ServerBoundCertService(

[mef, 2014/06/30 21:42:58]

do we need this?

[mmenke, 2014/06/30 21:55:25]

We do, and I added this to the builder (See line 300 in the builder's cc file). 
This will affect all contexts, but I after talking to David, it sounds like this
is desired (And we'll want to add a way to allow it to be stored on disk, at
some point, presumably).

-          new net::DefaultServerBoundCertStore(NULL),
-          file_thread_.message_loop_proxy()));
-  storage_->set_http_server_properties(
-      scoped_ptr<net::HttpServerProperties>(
-          new net::HttpServerPropertiesImpl()));
-  storage_->set_host_resolver(net::HostResolver::CreateDefaultResolver(
-      url_request_context_->net_log()));
-
-  net::HttpNetworkSession::Params network_session_params;
-  network_session_params.cert_verifier =
-      url_request_context_->cert_verifier();
-  network_session_params.transport_security_state =
-      url_request_context_->transport_security_state();
-  network_session_params.server_bound_cert_service =
-      url_request_context_->server_bound_cert_service();
-  network_session_params.net_log =
-      url_request_context_->net_log();
-  network_session_params.proxy_service =
-      url_request_context_->proxy_service();
-  network_session_params.ssl_config_service =
-      url_request_context_->ssl_config_service();
-  network_session_params.http_server_properties =
-      url_request_context_->http_server_properties();
-  network_session_params.host_resolver =
-      url_request_context_->host_resolver();
+  builder.set_user_agent("Mojo/0.1");
+  builder.set_proxy_service(net::ProxyService::CreateDirect());
+  builder.set_transport_security_persister_path(base_path);
 
   base::FilePath cache_path = base_path.Append(FILE_PATH_LITERAL("Cache"));
+  net::URLRequestContextBuilder::HttpCacheParams cache_params;
+  cache_params.path = base_path.Append(FILE_PATH_LITERAL("Cache"));

[mef, 2014/06/30 21:42:58]

shouldn't this be |cache_path|?

[mmenke, 2014/06/30 21:55:25]

Actually, I meant to delete the cache_path line (Which I've now done).

+  cache_params.type = net::URLRequestContextBuilder::HttpCacheParams::IN_MEMORY;

[mef, 2014/06/30 21:42:59]

Why change from DISK_CACHE to IN_MEMORY?

[mmenke, 2014/06/30 21:55:25]

Eee...That would have been bad!  Thanks for catching that.  Copy-paste error.

+  builder.EnableHttpCache(cache_params);
 
-  net::HttpCache::DefaultBackend* main_backend =
-      new net::HttpCache::DefaultBackend(
-          net::DISK_CACHE,
-          net::CACHE_BACKEND_DEFAULT,
-          cache_path,
-          0,
-          cache_thread_.message_loop_proxy());
-
-  net::HttpCache* main_cache = new net::HttpCache(
-      network_session_params, main_backend);
-  storage_->set_http_transaction_factory(main_cache);
+  builder.set_file_enabled(true);
 
-  scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
-      new net::URLRequestJobFactoryImpl());
-  job_factory->SetProtocolHandler(
-      "file",
-      new net::FileProtocolHandler(file_thread_.message_loop_proxy()));
-  storage_->set_job_factory(job_factory.release());
+  url_request_context_.reset(builder.Build());
 }
 
 NetworkContext::~NetworkContext() {