OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" | 5 #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 ChromeBrowserStateIOData::CreateHttpNetworkSession( | 455 ChromeBrowserStateIOData::CreateHttpNetworkSession( |
456 const ProfileParams& profile_params) const { | 456 const ProfileParams& profile_params) const { |
457 net::HttpNetworkSession::Params params; | 457 net::HttpNetworkSession::Params params; |
458 net::URLRequestContext* context = main_request_context(); | 458 net::URLRequestContext* context = main_request_context(); |
459 | 459 |
460 IOSChromeIOThread* const io_thread = profile_params.io_thread; | 460 IOSChromeIOThread* const io_thread = profile_params.io_thread; |
461 | 461 |
462 io_thread->InitializeNetworkSessionParams(¶ms); | 462 io_thread->InitializeNetworkSessionParams(¶ms); |
463 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(context, | 463 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(context, |
464 ¶ms); | 464 ¶ms); |
465 if (!IsOffTheRecord()) { | 465 if (!IsOffTheRecord() && io_thread->globals()->network_quality_estimator) { |
466 params.socket_performance_watcher_factory = | 466 params.socket_performance_watcher_factory = |
467 io_thread->globals()->network_quality_estimator.get(); | 467 io_thread->globals() |
| 468 ->network_quality_estimator->GetSocketPerformanceWatcherFactory(); |
468 } | 469 } |
469 | 470 |
470 return scoped_ptr<net::HttpNetworkSession>( | 471 return scoped_ptr<net::HttpNetworkSession>( |
471 new net::HttpNetworkSession(params)); | 472 new net::HttpNetworkSession(params)); |
472 } | 473 } |
473 | 474 |
474 scoped_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateMainHttpFactory( | 475 scoped_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateMainHttpFactory( |
475 net::HttpNetworkSession* session, | 476 net::HttpNetworkSession* session, |
476 scoped_ptr<net::HttpCache::BackendFactory> main_backend) const { | 477 scoped_ptr<net::HttpCache::BackendFactory> main_backend) const { |
477 return scoped_ptr<net::HttpCache>( | 478 return scoped_ptr<net::HttpCache>( |
478 new net::HttpCache(session, std::move(main_backend), true)); | 479 new net::HttpCache(session, std::move(main_backend), true)); |
479 } | 480 } |
480 | 481 |
481 scoped_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateHttpFactory( | 482 scoped_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateHttpFactory( |
482 net::HttpNetworkSession* shared_session, | 483 net::HttpNetworkSession* shared_session, |
483 scoped_ptr<net::HttpCache::BackendFactory> backend) const { | 484 scoped_ptr<net::HttpCache::BackendFactory> backend) const { |
484 return scoped_ptr<net::HttpCache>( | 485 return scoped_ptr<net::HttpCache>( |
485 new net::HttpCache(shared_session, std::move(backend), true)); | 486 new net::HttpCache(shared_session, std::move(backend), true)); |
486 } | 487 } |
OLD | NEW |