Switch to using URLRequestContextBuilder to create some URLRequestContexts.

mojo/services/network/network_context.h

Index: mojo/services/network/network_context.h
diff --git a/mojo/services/network/network_context.h b/mojo/services/network/network_context.h
index df8ab516fe08acd37815cd0c6b354f769091bd4e..19245f4b584e7376f401dd0f6c1345bf6c888efb 100644
--- a/mojo/services/network/network_context.h
+++ b/mojo/services/network/network_context.h
@@ -5,18 +5,15 @@
 #ifndef MOJO_SERVICES_NETWORK_NETWORK_CONTEXT_H_
 #define MOJO_SERVICES_NETWORK_NETWORK_CONTEXT_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/threading/thread.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace net {
-class NetLog;
 class URLRequestContext;
-class URLRequestContextStorage;
-class TransportSecurityPersister;
 }
 
 namespace mojo {
@@ -31,12 +28,7 @@ class NetworkContext {
   }
 
  private:
-  base::Thread file_thread_;
-  base::Thread cache_thread_;
-  scoped_ptr<net::NetLog> net_log_;
-  scoped_ptr<net::URLRequestContextStorage> storage_;
   scoped_ptr<net::URLRequestContext> url_request_context_;
-  scoped_ptr<net::TransportSecurityPersister> transport_security_persister_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkContext);
 };