| Index: chrome/browser/profiles/profile_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
|
| index 3d439fb2d92992a0de46bce4b720a20f66bb01a6..938aba45ac162dbe5b4ca3f3df61121f517b8f15 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -1291,9 +1291,10 @@ scoped_ptr<net::HttpNetworkSession> ProfileIOData::CreateHttpNetworkSession(
|
| net::HttpNetworkSession::Params params(io_thread->NetworkSessionParams());
|
| net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(context,
|
| ¶ms);
|
| - if (!IsOffTheRecord()) {
|
| + if (!IsOffTheRecord() && io_thread->globals()->network_quality_estimator) {
|
| params.socket_performance_watcher_factory =
|
| - io_thread->globals()->network_quality_estimator.get();
|
| + io_thread->globals()
|
| + ->network_quality_estimator->GetSocketPerformanceWatcherFactory();
|
| }
|
| if (data_reduction_proxy_io_data_.get())
|
| params.proxy_delegate = data_reduction_proxy_io_data_->proxy_delegate();
|
|
|