| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 989 context->set_cookie_store(globals->system_cookie_store.get()); | 989 context->set_cookie_store(globals->system_cookie_store.get()); |
| 990 context->set_channel_id_service( | 990 context->set_channel_id_service( |
| 991 globals->system_channel_id_service.get()); | 991 globals->system_channel_id_service.get()); |
| 992 context->set_network_delegate(globals->system_network_delegate.get()); | 992 context->set_network_delegate(globals->system_network_delegate.get()); |
| 993 context->set_http_user_agent_settings( | 993 context->set_http_user_agent_settings( |
| 994 globals->http_user_agent_settings.get()); | 994 globals->http_user_agent_settings.get()); |
| 995 context->set_network_quality_estimator( | 995 context->set_network_quality_estimator( |
| 996 globals->network_quality_estimator.get()); | 996 globals->network_quality_estimator.get()); |
| 997 context->set_backoff_manager(globals->url_request_backoff_manager.get()); | 997 context->set_backoff_manager(globals->url_request_backoff_manager.get()); |
| 998 | 998 |
| 999 context->set_http_server_properties( | 999 context->set_http_server_properties(globals->http_server_properties.get()); |
| 1000 globals->http_server_properties->GetWeakPtr()); | |
| 1001 | 1000 |
| 1002 context->set_enable_brotli(globals->enable_brotli); | 1001 context->set_enable_brotli(globals->enable_brotli); |
| 1003 | 1002 |
| 1004 net::HttpNetworkSession::Params system_params(params); | 1003 net::HttpNetworkSession::Params system_params(params); |
| 1005 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( | 1004 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( |
| 1006 context, &system_params); | 1005 context, &system_params); |
| 1007 | 1006 |
| 1008 globals->system_http_network_session.reset( | 1007 globals->system_http_network_session.reset( |
| 1009 new net::HttpNetworkSession(system_params)); | 1008 new net::HttpNetworkSession(system_params)); |
| 1010 globals->system_http_transaction_factory.reset( | 1009 globals->system_http_transaction_factory.reset( |
| (...skipping 29 matching lines...) Expand all Loading... |
| 1040 | 1039 |
| 1041 context->set_job_factory( | 1040 context->set_job_factory( |
| 1042 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1041 globals->proxy_script_fetcher_url_request_job_factory.get()); |
| 1043 | 1042 |
| 1044 context->set_cookie_store(globals->system_cookie_store.get()); | 1043 context->set_cookie_store(globals->system_cookie_store.get()); |
| 1045 context->set_channel_id_service( | 1044 context->set_channel_id_service( |
| 1046 globals->system_channel_id_service.get()); | 1045 globals->system_channel_id_service.get()); |
| 1047 context->set_network_delegate(globals->system_network_delegate.get()); | 1046 context->set_network_delegate(globals->system_network_delegate.get()); |
| 1048 context->set_http_user_agent_settings( | 1047 context->set_http_user_agent_settings( |
| 1049 globals->http_user_agent_settings.get()); | 1048 globals->http_user_agent_settings.get()); |
| 1050 context->set_http_server_properties( | 1049 context->set_http_server_properties(globals->http_server_properties.get()); |
| 1051 globals->http_server_properties->GetWeakPtr()); | |
| 1052 | 1050 |
| 1053 context->set_enable_brotli(globals->enable_brotli); | 1051 context->set_enable_brotli(globals->enable_brotli); |
| 1054 | 1052 |
| 1055 net::HttpNetworkSession::Params session_params(params); | 1053 net::HttpNetworkSession::Params session_params(params); |
| 1056 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( | 1054 net::URLRequestContextBuilder::SetHttpNetworkSessionComponents( |
| 1057 context, &session_params); | 1055 context, &session_params); |
| 1058 | 1056 |
| 1059 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 | 1057 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
| 1060 // is fixed. | 1058 // is fixed. |
| 1061 tracked_objects::ScopedTracker tracking_profile2( | 1059 tracked_objects::ScopedTracker tracking_profile2( |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1102 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1100 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1103 // system URLRequestContext too. There's no reason this should be tied to a | 1101 // system URLRequestContext too. There's no reason this should be tied to a |
| 1104 // profile. | 1102 // profile. |
| 1105 return context; | 1103 return context; |
| 1106 } | 1104 } |
| 1107 | 1105 |
| 1108 const metrics::UpdateUsagePrefCallbackType& | 1106 const metrics::UpdateUsagePrefCallbackType& |
| 1109 IOThread::GetMetricsDataUseForwarder() { | 1107 IOThread::GetMetricsDataUseForwarder() { |
| 1110 return metrics_data_use_forwarder_; | 1108 return metrics_data_use_forwarder_; |
| 1111 } | 1109 } |
| OLD | NEW |