Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Side by Side Diff: net/spdy/spdy_test_util_common.cc

Issue 2730053002: Revert of Server push cancellation: add a finch trial parameter (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/spdy/spdy_test_util_common.h ('k') | net/tools/quic/quic_dispatcher.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "net/spdy/spdy_test_util_common.h" 5 #include "net/spdy/spdy_test_util_common.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <cstddef> 9 #include <cstddef>
10 #include <utility> 10 #include <utility>
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 proxy_service(std::move(proxy_service)), 334 proxy_service(std::move(proxy_service)),
335 ssl_config_service(new SSLConfigServiceDefaults), 335 ssl_config_service(new SSLConfigServiceDefaults),
336 socket_factory(new MockClientSocketFactory), 336 socket_factory(new MockClientSocketFactory),
337 http_auth_handler_factory( 337 http_auth_handler_factory(
338 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), 338 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())),
339 http_server_properties(new HttpServerPropertiesImpl), 339 http_server_properties(new HttpServerPropertiesImpl),
340 enable_ip_pooling(true), 340 enable_ip_pooling(true),
341 enable_ping(false), 341 enable_ping(false),
342 enable_user_alternate_protocol_ports(false), 342 enable_user_alternate_protocol_ports(false),
343 enable_quic(false), 343 enable_quic(false),
344 enable_server_push_cancellation(false),
345 session_max_recv_window_size(kDefaultInitialWindowSize), 344 session_max_recv_window_size(kDefaultInitialWindowSize),
346 time_func(&base::TimeTicks::Now), 345 time_func(&base::TimeTicks::Now),
347 enable_http2_alternative_service_with_different_host(false), 346 enable_http2_alternative_service_with_different_host(false),
348 net_log(nullptr), 347 net_log(nullptr),
349 http_09_on_non_default_ports_enabled(false), 348 http_09_on_non_default_ports_enabled(false),
350 restrict_to_one_preconnect_for_proxies(false), 349 restrict_to_one_preconnect_for_proxies(false),
351 quic_do_not_mark_as_broken_on_network_change(false) { 350 quic_do_not_mark_as_broken_on_network_change(false) {
352 // Note: The CancelledTransaction test does cleanup by running all 351 // Note: The CancelledTransaction test does cleanup by running all
353 // tasks in the message loop (RunAllPending). Unfortunately, that 352 // tasks in the message loop (RunAllPending). Unfortunately, that
354 // doesn't clean up tasks on the host resolver thread; and 353 // doesn't clean up tasks on the host resolver thread; and
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 params.ct_policy_enforcer = session_deps->ct_policy_enforcer.get(); 395 params.ct_policy_enforcer = session_deps->ct_policy_enforcer.get();
397 params.proxy_service = session_deps->proxy_service.get(); 396 params.proxy_service = session_deps->proxy_service.get();
398 params.ssl_config_service = session_deps->ssl_config_service.get(); 397 params.ssl_config_service = session_deps->ssl_config_service.get();
399 params.http_auth_handler_factory = 398 params.http_auth_handler_factory =
400 session_deps->http_auth_handler_factory.get(); 399 session_deps->http_auth_handler_factory.get();
401 params.http_server_properties = session_deps->http_server_properties.get(); 400 params.http_server_properties = session_deps->http_server_properties.get();
402 params.enable_spdy_ping_based_connection_checking = session_deps->enable_ping; 401 params.enable_spdy_ping_based_connection_checking = session_deps->enable_ping;
403 params.enable_user_alternate_protocol_ports = 402 params.enable_user_alternate_protocol_ports =
404 session_deps->enable_user_alternate_protocol_ports; 403 session_deps->enable_user_alternate_protocol_ports;
405 params.enable_quic = session_deps->enable_quic; 404 params.enable_quic = session_deps->enable_quic;
406 params.enable_server_push_cancellation =
407 session_deps->enable_server_push_cancellation;
408 params.spdy_session_max_recv_window_size = 405 params.spdy_session_max_recv_window_size =
409 session_deps->session_max_recv_window_size; 406 session_deps->session_max_recv_window_size;
410 params.http2_settings = session_deps->http2_settings; 407 params.http2_settings = session_deps->http2_settings;
411 params.time_func = session_deps->time_func; 408 params.time_func = session_deps->time_func;
412 params.proxy_delegate = session_deps->proxy_delegate.get(); 409 params.proxy_delegate = session_deps->proxy_delegate.get();
413 params.enable_http2_alternative_service_with_different_host = 410 params.enable_http2_alternative_service_with_different_host =
414 session_deps->enable_http2_alternative_service_with_different_host; 411 session_deps->enable_http2_alternative_service_with_different_host;
415 params.net_log = session_deps->net_log; 412 params.net_log = session_deps->net_log;
416 params.http_09_on_non_default_ports_enabled = 413 params.http_09_on_non_default_ports_enabled =
417 session_deps->http_09_on_non_default_ports_enabled; 414 session_deps->http_09_on_non_default_ports_enabled;
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
1144 headers[GetSchemeKey()] = scheme.c_str(); 1141 headers[GetSchemeKey()] = scheme.c_str();
1145 headers[GetPathKey()] = path.c_str(); 1142 headers[GetPathKey()] = path.c_str();
1146 if (content_length) { 1143 if (content_length) {
1147 std::string length_str = base::Int64ToString(*content_length); 1144 std::string length_str = base::Int64ToString(*content_length);
1148 headers["content-length"] = length_str; 1145 headers["content-length"] = length_str;
1149 } 1146 }
1150 return headers; 1147 return headers;
1151 } 1148 }
1152 1149
1153 } // namespace net 1150 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_test_util_common.h ('k') | net/tools/quic/quic_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698