| Index: components/cronet/ios/cronet_environment.h
|
| diff --git a/components/cronet/ios/cronet_environment.h b/components/cronet/ios/cronet_environment.h
|
| index 30f29ea2c9f4ee3ebde133a822fc226e0a79a247..baf7c735f312f88bcd51792dc9cf6b2574d53319 100644
|
| --- a/components/cronet/ios/cronet_environment.h
|
| +++ b/components/cronet/ios/cronet_environment.h
|
| @@ -16,6 +16,7 @@
|
| #include "net/cert/cert_verifier.h"
|
| #include "net/url_request/url_request.h"
|
| #include "net/url_request/url_request_context.h"
|
| +#include "net/url_request/url_request_context_getter.h"
|
|
|
| class JsonPrefStore;
|
|
|
| @@ -80,18 +81,17 @@ class CronetEnvironment {
|
| ssl_key_log_file_name_ = ssl_key_log_file_name;
|
| }
|
|
|
| - net::URLRequestContext* GetURLRequestContext() const;
|
| + // Return the URLRequestContextGetter associated with this object.
|
| + net::URLRequestContextGetter* GetURLRequestContextGetter();
|
|
|
| - bool IsOnNetworkThread();
|
| + private:
|
| + // Performs initialization tasks that must happen on the network thread.
|
| + void InitializeOnNetworkThread();
|
|
|
| // Runs a closure on the network thread.
|
| void PostToNetworkThread(const tracked_objects::Location& from_here,
|
| const base::Closure& task);
|
|
|
| - private:
|
| - // Performs initialization tasks that must happen on the network thread.
|
| - void InitializeOnNetworkThread();
|
| -
|
| // Runs a closure on the file user blocking thread.
|
| void PostToFileUserBlockingThread(const tracked_objects::Location& from_here,
|
| const base::Closure& task);
|
| @@ -123,6 +123,7 @@ class CronetEnvironment {
|
| std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
|
| std::unique_ptr<net::HttpServerProperties> http_server_properties_;
|
| std::unique_ptr<net::URLRequestContext> main_context_;
|
| + scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
|
| std::string user_agent_product_name_;
|
| std::unique_ptr<net::NetLog> net_log_;
|
| std::unique_ptr<net::WriteToFileNetLogObserver> net_log_observer_;
|
|
|