Index: android_webview/browser/net/aw_url_request_context_getter.h |
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h |
index 6e4f81e7327d159fd6fa78c27384c58890521bfc..ddfbe6f1bfe39d4a1c0f954cd9fc594f3d37a633 100644 |
--- a/android_webview/browser/net/aw_url_request_context_getter.h |
+++ b/android_webview/browser/net/aw_url_request_context_getter.h |
@@ -24,11 +24,10 @@ class URLRequestJobFactory; |
} |
namespace data_reduction_proxy { |
+class DataReductionProxyAuthRequestHandler; |
class DataReductionProxyConfigService; |
} |
-using data_reduction_proxy::DataReductionProxyConfigService; |
- |
namespace android_webview { |
class AwNetworkDelegate; |
@@ -45,7 +44,11 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter { |
virtual scoped_refptr<base::SingleThreadTaskRunner> |
GetNetworkTaskRunner() const OVERRIDE; |
- DataReductionProxyConfigService* proxy_config_service(); |
+ data_reduction_proxy::DataReductionProxyConfigService* |
+ GetDataReductionProxyConfigService() const; |
+ |
+ data_reduction_proxy::DataReductionProxyAuthRequestHandler* |
+ GetDataReductionProxyAuthRequestHandler() const; |
private: |
friend class AwBrowserContext; |
@@ -66,7 +69,10 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter { |
const base::FilePath partition_path_; |
scoped_refptr<net::CookieStore> cookie_store_; |
scoped_ptr<net::URLRequestContext> url_request_context_; |
- scoped_ptr<DataReductionProxyConfigService> proxy_config_service_; |
+ scoped_ptr<data_reduction_proxy::DataReductionProxyConfigService> |
+ data_reduction_proxy_config_service_; |
+ scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> |
+ data_reduction_proxy_auth_request_handler_; |
scoped_ptr<net::URLRequestJobFactory> job_factory_; |
scoped_ptr<net::HttpTransactionFactory> main_http_factory_; |
scoped_ptr<net::ChannelIDService> channel_id_service_; |