| Index: components/cronet/android/url_request_context_adapter.h
|
| diff --git a/components/cronet/android/url_request_context_adapter.h b/components/cronet/android/url_request_context_adapter.h
|
| index 1bb2e70632d377b7366450f1e6f984c4a11e1b4d..8541d032c0df2138d42ade93ae9c7eac96d8d272 100644
|
| --- a/components/cronet/android/url_request_context_adapter.h
|
| +++ b/components/cronet/android/url_request_context_adapter.h
|
| @@ -14,6 +14,7 @@
|
| #include "base/threading/thread.h"
|
| #include "net/base/net_log.h"
|
| #include "net/base/network_change_notifier.h"
|
| +#include "net/proxy/proxy_config_service.h"
|
| #include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
|
|
| @@ -45,6 +46,7 @@ class URLRequestContextAdapter : public net::URLRequestContextGetter {
|
| : public base::RefCountedThreadSafe<URLRequestContextAdapterDelegate> {
|
| public:
|
| virtual void OnContextInitialized(URLRequestContextAdapter* context) = 0;
|
| + virtual void InitProxyConfigService() = 0;
|
|
|
| protected:
|
| friend class base::RefCountedThreadSafe<URLRequestContextAdapterDelegate>;
|
| @@ -65,6 +67,7 @@ class URLRequestContextAdapter : public net::URLRequestContextGetter {
|
|
|
| void StartNetLogToFile(const std::string& file_name);
|
| void StopNetLog();
|
| + void InitProxyConfigServiceOnUIThread();
|
|
|
| private:
|
| scoped_refptr<URLRequestContextAdapterDelegate> delegate_;
|
| @@ -74,6 +77,10 @@ class URLRequestContextAdapter : public net::URLRequestContextGetter {
|
| scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
|
| scoped_ptr<NetLogObserver> net_log_observer_;
|
| scoped_ptr<net::NetLogLogger> net_log_logger_;
|
| + scoped_ptr<net::ProxyConfigService> proxy_config_service_;
|
| + scoped_ptr<URLRequestContextConfig> config_;
|
| + // Android specific UI MessageLoop.
|
| + scoped_ptr<base::MessageLoop> main_message_loop_;
|
|
|
| virtual ~URLRequestContextAdapter();
|
|
|
|
|