| 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 "components/cronet/url_request_context_config.h" | 5 #include "components/cronet/url_request_context_config.h" |
| 6 | 6 |
| 7 #include "base/values.h" | 7 #include "base/values.h" |
| 8 #include "net/cert/cert_verifier.h" | 8 #include "net/cert/cert_verifier.h" |
| 9 #include "net/http/http_network_session.h" | 9 #include "net/http/http_network_session.h" |
| 10 #include "net/proxy/proxy_config.h" | 10 #include "net/proxy/proxy_config.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 "", | 53 "", |
| 54 // Fallback data reduction proxy. | 54 // Fallback data reduction proxy. |
| 55 "", | 55 "", |
| 56 // Data reduction proxy secure proxy check URL. | 56 // Data reduction proxy secure proxy check URL. |
| 57 "", | 57 "", |
| 58 // MockCertVerifier to use for testing purposes. | 58 // MockCertVerifier to use for testing purposes. |
| 59 scoped_ptr<net::CertVerifier>()); | 59 scoped_ptr<net::CertVerifier>()); |
| 60 | 60 |
| 61 net::URLRequestContextBuilder builder; | 61 net::URLRequestContextBuilder builder; |
| 62 net::NetLog net_log; | 62 net::NetLog net_log; |
| 63 config.ConfigureURLRequestContextBuilder(&builder, &net_log); | 63 config.ConfigureURLRequestContextBuilder(&builder, &net_log, nullptr); |
| 64 // Set a ProxyConfigService to avoid DCHECK failure when building. | 64 // Set a ProxyConfigService to avoid DCHECK failure when building. |
| 65 builder.set_proxy_config_service(make_scoped_ptr( | 65 builder.set_proxy_config_service(make_scoped_ptr( |
| 66 new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect()))); | 66 new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect()))); |
| 67 scoped_ptr<net::URLRequestContext> context(builder.Build()); | 67 scoped_ptr<net::URLRequestContext> context(builder.Build()); |
| 68 const net::HttpNetworkSession::Params* params = | 68 const net::HttpNetworkSession::Params* params = |
| 69 context->GetNetworkSessionParams(); | 69 context->GetNetworkSessionParams(); |
| 70 // Check Quic Connection options. | 70 // Check Quic Connection options. |
| 71 net::QuicTagVector quic_connection_options; | 71 net::QuicTagVector quic_connection_options; |
| 72 quic_connection_options.push_back(net::kTIME); | 72 quic_connection_options.push_back(net::kTIME); |
| 73 quic_connection_options.push_back(net::kTBBR); | 73 quic_connection_options.push_back(net::kTBBR); |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 "", | 130 "", |
| 131 // Fallback data reduction proxy. | 131 // Fallback data reduction proxy. |
| 132 "", | 132 "", |
| 133 // Data reduction proxy secure proxy check URL. | 133 // Data reduction proxy secure proxy check URL. |
| 134 "", | 134 "", |
| 135 // MockCertVerifier to use for testing purposes. | 135 // MockCertVerifier to use for testing purposes. |
| 136 scoped_ptr<net::CertVerifier>()); | 136 scoped_ptr<net::CertVerifier>()); |
| 137 | 137 |
| 138 net::URLRequestContextBuilder builder; | 138 net::URLRequestContextBuilder builder; |
| 139 net::NetLog net_log; | 139 net::NetLog net_log; |
| 140 config.ConfigureURLRequestContextBuilder(&builder, &net_log); | 140 config.ConfigureURLRequestContextBuilder(&builder, &net_log, nullptr); |
| 141 // Set a ProxyConfigService to avoid DCHECK failure when building. | 141 // Set a ProxyConfigService to avoid DCHECK failure when building. |
| 142 builder.set_proxy_config_service(make_scoped_ptr( | 142 builder.set_proxy_config_service(make_scoped_ptr( |
| 143 new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect()))); | 143 new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect()))); |
| 144 scoped_ptr<net::URLRequestContext> context(builder.Build()); | 144 scoped_ptr<net::URLRequestContext> context(builder.Build()); |
| 145 const net::HttpNetworkSession::Params* params = | 145 const net::HttpNetworkSession::Params* params = |
| 146 context->GetNetworkSessionParams(); | 146 context->GetNetworkSessionParams(); |
| 147 | 147 |
| 148 EXPECT_FALSE(params->quic_close_sessions_on_ip_change); | 148 EXPECT_FALSE(params->quic_close_sessions_on_ip_change); |
| 149 EXPECT_TRUE(params->quic_migrate_sessions_on_network_change); | 149 EXPECT_TRUE(params->quic_migrate_sessions_on_network_change); |
| 150 EXPECT_TRUE(params->quic_migrate_sessions_early); | 150 EXPECT_TRUE(params->quic_migrate_sessions_early); |
| 151 } | 151 } |
| 152 | 152 |
| 153 } // namespace cronet | 153 } // namespace cronet |
| OLD | NEW |