| Index: components/cronet/ios/cronet_environment.h
|
| diff --git a/components/cronet/ios/cronet_environment.h b/components/cronet/ios/cronet_environment.h
|
| index 95b4db207f88edcc04e18fcedecd40cb2782fa37..6afde9cb6236346fda0a17db616f6ee6375e1e88 100644
|
| --- a/components/cronet/ios/cronet_environment.h
|
| +++ b/components/cronet/ios/cronet_environment.h
|
| @@ -44,8 +44,8 @@
|
| static void Initialize();
|
|
|
| // |user_agent| will be used to generate the user-agent if
|
| - // |user_agent_partial| is true, or will be used as the complete user-agent
|
| - // otherwise.
|
| + // |user_agent_partial|
|
| + // is true, or will be used as complete user-agent otherwise.
|
| CronetEnvironment(const std::string& user_agent, bool user_agent_partial);
|
| ~CronetEnvironment();
|
|
|
| @@ -84,25 +84,27 @@
|
| cert_verifier_ = std::move(cert_verifier);
|
| }
|
|
|
| - void SetHostResolverRules(const std::string& host_resolver_rules);
|
| + void set_host_resolver_rules(const std::string& host_resolver_rules) {
|
| + host_resolver_rules_ = host_resolver_rules;
|
| + }
|
|
|
| void set_ssl_key_log_file_name(const std::string& ssl_key_log_file_name) {
|
| ssl_key_log_file_name_ = ssl_key_log_file_name;
|
| }
|
|
|
| - // Returns the URLRequestContext associated with this object.
|
| net::URLRequestContext* GetURLRequestContext() const;
|
|
|
| - // Return the URLRequestContextGetter associated with this object.
|
| net::URLRequestContextGetter* GetURLRequestContextGetter() const;
|
| +
|
| + bool IsOnNetworkThread();
|
| +
|
| + // 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 network thread.
|
| - void PostToNetworkThread(const tracked_objects::Location& from_here,
|
| - const base::Closure& task);
|
|
|
| // Runs a closure on the file user blocking thread.
|
| void PostToFileUserBlockingThread(const tracked_objects::Location& from_here,
|
| @@ -118,13 +120,10 @@
|
| net::HttpNetworkSession* GetHttpNetworkSession(
|
| net::URLRequestContext* context);
|
|
|
| - // Sets host resolver rules on the network_io_thread_.
|
| - void SetHostResolverRulesOnNetworkThread(const std::string& rules,
|
| - base::WaitableEvent* event);
|
| -
|
| bool http2_enabled_;
|
| bool quic_enabled_;
|
| std::string accept_language_;
|
| + std::string host_resolver_rules_;
|
| std::string ssl_key_log_file_name_;
|
|
|
| std::list<net::HostPortPair> quic_hints_;
|
|
|