| Index: net/url_request/url_request_context_builder.h
|
| diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h
|
| index ddbca53991ddf83d1d6aee58c0629e24424e8e6c..ba8642a4c0d0a85c22bd54d0e6e182869b6a4c93 100644
|
| --- a/net/url_request/url_request_context_builder.h
|
| +++ b/net/url_request/url_request_context_builder.h
|
| @@ -23,10 +23,13 @@
|
| #include "build/build_config.h"
|
| #include "net/base/net_export.h"
|
|
|
| +namespace base {
|
| +class SingleThreadTaskRunner;
|
| +} // namespace base
|
| +
|
| namespace net {
|
|
|
| class HostMappingRules;
|
| -class ProxyConfigService;
|
| class URLRequestContext;
|
|
|
| class NET_EXPORT URLRequestContextBuilder {
|
| @@ -80,7 +83,7 @@ class NET_EXPORT URLRequestContextBuilder {
|
| ~URLRequestContextBuilder();
|
|
|
| #if defined(OS_LINUX)
|
| - void set_proxy_config_service(ProxyConfigService* proxy_config_service);
|
| + void set_glib_task_runner(base::SingleThreadTaskRunner* glib_task_runner);
|
| #endif // defined(OS_LINUX)
|
|
|
| // Call this function to specify a hard-coded User-Agent for all requests that
|
| @@ -115,13 +118,13 @@ class NET_EXPORT URLRequestContextBuilder {
|
| private:
|
| std::string user_agent_;
|
| bool ftp_enabled_;
|
| +#if defined(OS_LINUX)
|
| + base::SingleThreadTaskRunner* glib_task_runner_;
|
| +#endif // defined(OS_LINUX)
|
| HostResolverParams host_resolver_params_;
|
| bool http_cache_enabled_;
|
| HttpCacheParams http_cache_params_;
|
| HttpNetworkSessionParams http_network_session_params_;
|
| -#if defined(OS_LINUX)
|
| - scoped_ptr<ProxyConfigService> proxy_config_service_;
|
| -#endif // defined(OS_LINUX)
|
|
|
| DISALLOW_COPY_AND_ASSIGN(URLRequestContextBuilder);
|
| };
|
|
|