Allow ProxyService to share URLRequestContext with everything else.

net/proxy/proxy_service.h

Index: net/proxy/proxy_service.h
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 71ab1100bc3f0f78e36e78535f04125e7c878539..69d2ce404cebceb169ec939a25ac98d046210fd5 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -223,7 +223,12 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
   void SetProxyScriptFetchers(
       ProxyScriptFetcher* proxy_script_fetcher,
       std::unique_ptr<DhcpProxyScriptFetcher> dhcp_proxy_script_fetcher);
-  ProxyScriptFetcher* GetProxyScriptFetcher() const;
+
+  // Cancels all activity (including network requests), and causes new and
+  // in-progress resolutions to just hang. This is needed to breat the circular

[eroman, 2017/04/27 19:35:42]

breat -> break

+  // dependency when the ProxyService a URLRequestContext is using also uses

[eroman, 2017/04/27 19:35:42]

wording

+  // that URLRequestContext to make requests.
+  void ShutDown();
 
   // Tells this ProxyService to start using a new ProxyConfigService to
   // retrieve its ProxyConfig from. The new ProxyConfigService will immediately
@@ -330,6 +335,7 @@ class NET_EXPORT ProxyService : public NetworkChangeNotifier::IPAddressObserver,
     STATE_WAITING_FOR_PROXY_CONFIG,
     STATE_WAITING_FOR_INIT_PROXY_RESOLVER,
     STATE_READY,
+    STATE_SHUTDOWN,
   };
 
   // Resets all the variables associated with the current proxy configuration,