Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Unified Diff: net/proxy/dhcp_proxy_script_fetcher_win.h

Issue 2845643003: Allow ProxyService to share URLRequestContext with everything else. (Closed)
Patch Set: Fix fetcher shutdown with no active request, add test, add comment Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher.cc ('k') | net/proxy/dhcp_proxy_script_fetcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/dhcp_proxy_script_fetcher_win.h
diff --git a/net/proxy/dhcp_proxy_script_fetcher_win.h b/net/proxy/dhcp_proxy_script_fetcher_win.h
index ee291b49c18c3e2a23777a1db6d9bef21423fc10..3ca981d6a62624d256a7b5e52898b3b1d7a7c029 100644
--- a/net/proxy/dhcp_proxy_script_fetcher_win.h
+++ b/net/proxy/dhcp_proxy_script_fetcher_win.h
@@ -44,6 +44,7 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptFetcherWin
int Fetch(base::string16* utf16_text,
const CompletionCallback& callback) override;
void Cancel() override;
+ void OnShutdown() override;
const GURL& GetPacURL() const override;
std::string GetFetcherName() const override;
@@ -165,7 +166,8 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptFetcherWin
base::OneShotTimer wait_timer_;
- URLRequestContext* const url_request_context_;
+ // Set to nullptr on cancellation.
+ URLRequestContext* url_request_context_;
// NULL or the AdapterQuery currently in flight.
scoped_refptr<AdapterQuery> last_query_;
« no previous file with comments | « net/proxy/dhcp_proxy_script_fetcher.cc ('k') | net/proxy/dhcp_proxy_script_fetcher_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698