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

Unified Diff: headless/lib/browser/headless_url_request_context_getter.h

Issue 2013483002: headless: Make HeadlessBrowser::Options move-only (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
Index: headless/lib/browser/headless_url_request_context_getter.h
diff --git a/headless/lib/browser/headless_url_request_context_getter.h b/headless/lib/browser/headless_url_request_context_getter.h
index 99340a6cc3c7e7ca960140bad5eda09a0ffddd23..d423b50883702d7ca5b8483ebd1ec5ac842698ed 100644
--- a/headless/lib/browser/headless_url_request_context_getter.h
+++ b/headless/lib/browser/headless_url_request_context_getter.h
@@ -44,7 +44,7 @@ class HeadlessURLRequestContextGetter : public net::URLRequestContextGetter {
content::ProtocolHandlerMap* protocol_handlers,
content::URLRequestInterceptorScopedVector request_interceptors,
net::NetLog* net_log,
- const HeadlessBrowser::Options& options);
+ HeadlessBrowser::Options* options);
// net::URLRequestContextGetter implementation:
net::URLRequestContext* GetURLRequestContext() override;
@@ -66,7 +66,13 @@ class HeadlessURLRequestContextGetter : public net::URLRequestContextGetter {
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
net::NetLog* net_log_;
- HeadlessBrowser::Options options_;
+
+ // The |options| object given to the constructor is not guaranteed to outlive
+ // this class, so we make copies of the parts we need to access on the IO
+ // thread.
+ std::string user_agent_;
+ std::string host_resolver_rules_;
+ net::HostPortPair proxy_server_;
std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
std::unique_ptr<net::NetworkDelegate> network_delegate_;
« no previous file with comments | « headless/lib/browser/headless_devtools.cc ('k') | headless/lib/browser/headless_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698