| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/crnet/crnet_environment.h" | 5 #include "ios/crnet/crnet_environment.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 net::HttpNetworkSession::Params params; | 422 net::HttpNetworkSession::Params params; |
| 423 params.host_resolver = main_context_->host_resolver(); | 423 params.host_resolver = main_context_->host_resolver(); |
| 424 params.cert_verifier = main_context_->cert_verifier(); | 424 params.cert_verifier = main_context_->cert_verifier(); |
| 425 params.channel_id_service = main_context_->channel_id_service(); | 425 params.channel_id_service = main_context_->channel_id_service(); |
| 426 params.transport_security_state = main_context_->transport_security_state(); | 426 params.transport_security_state = main_context_->transport_security_state(); |
| 427 params.proxy_service = main_context_->proxy_service(); | 427 params.proxy_service = main_context_->proxy_service(); |
| 428 params.ssl_config_service = main_context_->ssl_config_service(); | 428 params.ssl_config_service = main_context_->ssl_config_service(); |
| 429 params.http_auth_handler_factory = main_context_->http_auth_handler_factory(); | 429 params.http_auth_handler_factory = main_context_->http_auth_handler_factory(); |
| 430 params.http_server_properties = main_context_->http_server_properties(); | 430 params.http_server_properties = main_context_->http_server_properties(); |
| 431 params.net_log = main_context_->net_log(); | 431 params.net_log = main_context_->net_log(); |
| 432 params.enable_spdy31 = spdy_enabled(); | |
| 433 params.enable_http2 = spdy_enabled(); | 432 params.enable_http2 = spdy_enabled(); |
| 434 params.enable_quic = quic_enabled(); | 433 params.enable_quic = quic_enabled(); |
| 435 | 434 |
| 436 if (!params.channel_id_service) { | 435 if (!params.channel_id_service) { |
| 437 // The main context may not have a ChannelIDService, since it is lazily | 436 // The main context may not have a ChannelIDService, since it is lazily |
| 438 // constructed. If not, build an ephemeral ChannelIDService with no backing | 437 // constructed. If not, build an ephemeral ChannelIDService with no backing |
| 439 // disk store. | 438 // disk store. |
| 440 // TODO(ellyjones): support persisting ChannelID. | 439 // TODO(ellyjones): support persisting ChannelID. |
| 441 params.channel_id_service = new net::ChannelIDService( | 440 params.channel_id_service = new net::ChannelIDService( |
| 442 new net::DefaultChannelIDStore(NULL), | 441 new net::DefaultChannelIDStore(NULL), |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 | 479 |
| 481 return user_agent_settings->GetUserAgent(); | 480 return user_agent_settings->GetUserAgent(); |
| 482 } | 481 } |
| 483 | 482 |
| 484 void CrNetEnvironment::ClearCache(ClearCacheCallback callback) { | 483 void CrNetEnvironment::ClearCache(ClearCacheCallback callback) { |
| 485 PostToNetworkThread( | 484 PostToNetworkThread( |
| 486 FROM_HERE, | 485 FROM_HERE, |
| 487 base::Bind(&net::ClearHttpCache, main_context_getter_, | 486 base::Bind(&net::ClearHttpCache, main_context_getter_, |
| 488 network_io_thread_->task_runner(), base::BindBlock(callback))); | 487 network_io_thread_->task_runner(), base::BindBlock(callback))); |
| 489 } | 488 } |
| OLD | NEW |