| 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 1ec4123630a8bb6d7e08ef2a90cd5dcbdaf6e279..122cde7eb1d2904762fc9bcc28beb1e9fd6c1c82 100644
|
| --- a/android_webview/browser/net/aw_url_request_context_getter.h
|
| +++ b/android_webview/browser/net/aw_url_request_context_getter.h
|
| @@ -17,6 +17,7 @@
|
| namespace net {
|
| class CookieStore;
|
| class HttpTransactionFactory;
|
| +class NetLog;
|
| class ProxyConfigService;
|
| class URLRequestContext;
|
| class URLRequestJobFactory;
|
| @@ -39,8 +40,6 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
|
| scoped_ptr<data_reduction_proxy::DataReductionProxyConfigService>
|
| config_service);
|
|
|
| - void InitializeOnNetworkThread();
|
| -
|
| // net::URLRequestContextGetter implementation.
|
| virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
|
| virtual scoped_refptr<base::SingleThreadTaskRunner>
|
| @@ -49,6 +48,10 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
|
| data_reduction_proxy::DataReductionProxyAuthRequestHandler*
|
| GetDataReductionProxyAuthRequestHandler() const;
|
|
|
| + // NetLog is thread-safe, so clients can call this method from arbitrary
|
| + // threads (UI and IO).
|
| + net::NetLog* GetNetLog();
|
| +
|
| private:
|
| friend class AwBrowserContext;
|
| virtual ~AwURLRequestContextGetter();
|
| @@ -67,6 +70,7 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
|
|
|
| const base::FilePath partition_path_;
|
| scoped_refptr<net::CookieStore> cookie_store_;
|
| + scoped_ptr<net::NetLog> net_log_;
|
| scoped_ptr<net::URLRequestContext> url_request_context_;
|
| scoped_ptr<data_reduction_proxy::DataReductionProxyConfigService>
|
| data_reduction_proxy_config_service_;
|
|
|