| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index 2a0b606977348537dc4e1a20aec8a0527314322c..ba415127eb4b9817b8e56e15e891ff27dd4f0aa9 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -33,6 +33,7 @@
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/http/http_network_session.h"
|
| #include "net/nqe/network_quality_estimator.h"
|
| +#include "net/url_request/url_request_context_builder.h"
|
|
|
| class PrefProxyConfigTracker;
|
| class PrefService;
|
| @@ -200,11 +201,11 @@ class IOThread : public content::BrowserThreadDelegate {
|
| void ClearHostCache(
|
| const base::Callback<bool(const std::string&)>& host_filter);
|
|
|
| - const net::HttpNetworkSession::Params& NetworkSessionParams() const;
|
| + net::HttpNetworkSession::Params NetworkSessionParams() const;
|
|
|
| // Dynamically disables QUIC for HttpNetworkSessions owned by io_thread, and
|
| - // to HttpNetworkSession::Params which are used for the creation of new
|
| - // HttpNetworkSessions. Not that re-enabling Quic dynamically is not
|
| + // to |params_| which are used for the creation of new
|
| + // HttpNetworkSessions. Note that re-enabling Quic dynamically is not
|
| // supported for simplicity and requires a browser restart.
|
| void DisableQuic();
|
|
|
| @@ -269,7 +270,7 @@ class IOThread : public content::BrowserThreadDelegate {
|
| const base::CommandLine& command_line,
|
| bool is_quic_allowed_by_policy,
|
| bool http_09_on_non_default_ports_enabled,
|
| - net::HttpNetworkSession::Params* params);
|
| + net::URLRequestContextBuilder::HttpNetworkSessionParams* params);
|
|
|
| // The NetLog is owned by the browser process, to allow logging from other
|
| // threads during shutdown, but is used most frequently on the IOThread.
|
| @@ -291,7 +292,7 @@ class IOThread : public content::BrowserThreadDelegate {
|
|
|
| Globals* globals_;
|
|
|
| - net::HttpNetworkSession::Params params_;
|
| + net::URLRequestContextBuilder::HttpNetworkSessionParams params_;
|
|
|
| // Observer that logs network changes to the ChromeNetLog.
|
| std::unique_ptr<net::LoggingNetworkChangeObserver> network_change_observer_;
|
|
|