Create a URLRequestContext for PAC fetching.

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index d6361b0999f13ae6461fd37001d7f840c88d9da7..8e52ca087f3032b951c35a28276db13566f1435b 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <list>
-#include <set>
 #include <string>
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
@@ -31,10 +30,13 @@ class Predictor;
 
 namespace net {
 class CertVerifier;
+class ClientSocketFactory;
 class DnsRRResolver;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class ProxyScriptFetcher;
+class ProxyService;
+class SSLConfigService;
 class URLSecurityManager;
 }  // namespace net
 
@@ -44,12 +46,16 @@ class IOThread : public BrowserProcessSubThread {
     Globals();
     ~Globals();
 
+    net::ClientSocketFactory* client_socket_factory;

[eroman, 2010/12/23 01:40:59]

Where is this freed? Or is GetDefaultFactory a singleton?

[willchan no longer on Chromium, 2010/12/23 23:51:58]

It surprised me to find out it is a singleton.  I originally wrote this as a
scoped_ptr and it crashed on me :P

     scoped_ptr<net::HostResolver> host_resolver;
     scoped_ptr<net::CertVerifier> cert_verifier;
     scoped_ptr<net::DnsRRResolver> dnsrr_resolver;
+    scoped_refptr<net::SSLConfigService> ssl_config_service;
     scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
+    scoped_refptr<net::ProxyService> proxy_script_fetcher_proxy_service;
     scoped_ptr<net::URLSecurityManager> url_security_manager;
     ChromeNetworkDelegate network_delegate;
+    scoped_refptr<URLRequestContext> proxy_script_fetcher_context;
   };
 
   // |net_log| must either outlive the IOThread or be NULL.
@@ -93,22 +99,12 @@ class IOThread : public BrowserProcessSubThread {
   // IOThread's message loop.
   void ChangedToOnTheRecord();
 
-  // Creates a ProxyScriptFetcherImpl which will be automatically aborted
-  // during shutdown.
-  // This is used to avoid cycles between the ProxyScriptFetcher and the
-  // URLRequestContext that owns it (indirectly via the ProxyService).
-  net::ProxyScriptFetcher* CreateAndRegisterProxyScriptFetcher(
-      URLRequestContext* url_request_context);
-
  protected:
   virtual void Init();
   virtual void CleanUp();
   virtual void CleanUpAfterMessageLoopDestruction();
 
  private:
-  class ManagedProxyScriptFetcher;
-  typedef std::set<ManagedProxyScriptFetcher*> ProxyScriptFetchers;
-
   static void RegisterPrefs(PrefService* local_state);
 
   net::HttpAuthHandlerFactory* CreateDefaultAuthHandlerFactory(
@@ -160,9 +156,6 @@ class IOThread : public BrowserProcessSubThread {
   chrome_browser_net::Predictor* predictor_;
   scoped_ptr<PrerenderInterceptor> prerender_interceptor_;
 
-  // List of live ProxyScriptFetchers.
-  ProxyScriptFetchers fetchers_;
-
   // Keeps track of all live ChromeURLRequestContextGetters, so the
   // ChromeURLRequestContexts can be released during
   // IOThread::CleanUpAfterMessageLoopDestruction().