| 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/profiles/off_the_record_profile_io_data.h" | 5 #include "chrome/browser/profiles/off_the_record_profile_io_data.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 net::URLRequestContextStorage* main_context_storage = | 199 net::URLRequestContextStorage* main_context_storage = |
| 200 main_request_context_storage(); | 200 main_request_context_storage(); |
| 201 | 201 |
| 202 IOThread* const io_thread = profile_params->io_thread; | 202 IOThread* const io_thread = profile_params->io_thread; |
| 203 IOThread::Globals* const io_thread_globals = io_thread->globals(); | 203 IOThread::Globals* const io_thread_globals = io_thread->globals(); |
| 204 | 204 |
| 205 ApplyProfileParamsToContext(main_context); | 205 ApplyProfileParamsToContext(main_context); |
| 206 | 206 |
| 207 main_context->set_transport_security_state(transport_security_state()); | 207 main_context->set_transport_security_state(transport_security_state()); |
| 208 main_context->set_cert_transparency_verifier( | 208 main_context->set_cert_transparency_verifier( |
| 209 io_thread_globals->cert_transparency_verifier.get()); | 209 io_thread_globals->system_request_context->cert_transparency_verifier()); |
| 210 main_context->set_ct_policy_enforcer( | 210 main_context->set_ct_policy_enforcer( |
| 211 io_thread_globals->system_request_context->ct_policy_enforcer()); | 211 io_thread_globals->system_request_context->ct_policy_enforcer()); |
| 212 | 212 |
| 213 main_context->set_net_log(io_thread->net_log()); | 213 main_context->set_net_log(io_thread->net_log()); |
| 214 | 214 |
| 215 main_context->set_http_auth_handler_factory( | 215 main_context->set_http_auth_handler_factory( |
| 216 io_thread_globals->http_auth_handler_factory.get()); | 216 io_thread_globals->system_request_context->http_auth_handler_factory()); |
| 217 main_context->set_proxy_service(proxy_service()); | 217 main_context->set_proxy_service(proxy_service()); |
| 218 | 218 |
| 219 // For incognito, we use the default non-persistent HttpServerPropertiesImpl. | 219 // For incognito, we use the default non-persistent HttpServerPropertiesImpl. |
| 220 main_context_storage->set_http_server_properties( | 220 main_context_storage->set_http_server_properties( |
| 221 base::MakeUnique<net::HttpServerPropertiesImpl>()); | 221 base::MakeUnique<net::HttpServerPropertiesImpl>()); |
| 222 | 222 |
| 223 // For incognito, we use a non-persistent channel ID store. | 223 // For incognito, we use a non-persistent channel ID store. |
| 224 main_context_storage->set_channel_id_service( | 224 main_context_storage->set_channel_id_service( |
| 225 base::MakeUnique<net::ChannelIDService>( | 225 base::MakeUnique<net::ChannelIDService>( |
| 226 new net::DefaultChannelIDStore(nullptr))); | 226 new net::DefaultChannelIDStore(nullptr))); |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 return app_request_context; | 349 return app_request_context; |
| 350 } | 350 } |
| 351 | 351 |
| 352 net::URLRequestContext* | 352 net::URLRequestContext* |
| 353 OffTheRecordProfileIOData::AcquireIsolatedMediaRequestContext( | 353 OffTheRecordProfileIOData::AcquireIsolatedMediaRequestContext( |
| 354 net::URLRequestContext* app_context, | 354 net::URLRequestContext* app_context, |
| 355 const StoragePartitionDescriptor& partition_descriptor) const { | 355 const StoragePartitionDescriptor& partition_descriptor) const { |
| 356 NOTREACHED(); | 356 NOTREACHED(); |
| 357 return NULL; | 357 return NULL; |
| 358 } | 358 } |
| OLD | NEW |