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

Side by Side Diff: net/http/http_network_session.cc

Issue 2656693003: Merge 2617c4a136497244376e1bcf11aa356afb2a1e06 (Closed)
Patch Set: fix Created 3 years, 11 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 | « chrome/browser/net/errorpage_browsertest.cc ('k') | no next file » | 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) 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 "net/http/http_network_session.h" 5 #include "net/http/http_network_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 quic_disable_preconnect_if_0rtt(false), 120 quic_disable_preconnect_if_0rtt(false),
121 quic_migrate_sessions_on_network_change(false), 121 quic_migrate_sessions_on_network_change(false),
122 quic_migrate_sessions_early(false), 122 quic_migrate_sessions_early(false),
123 quic_allow_server_migration(false), 123 quic_allow_server_migration(false),
124 quic_disable_bidirectional_streams(false), 124 quic_disable_bidirectional_streams(false),
125 quic_force_hol_blocking(false), 125 quic_force_hol_blocking(false),
126 quic_race_cert_verification(false), 126 quic_race_cert_verification(false),
127 quic_do_not_fragment(false), 127 quic_do_not_fragment(false),
128 proxy_delegate(NULL), 128 proxy_delegate(NULL),
129 enable_token_binding(false), 129 enable_token_binding(false),
130 http_09_on_non_default_ports_enabled(false) { 130 http_09_on_non_default_ports_enabled(true) {
131 quic_supported_versions.push_back(QUIC_VERSION_35); 131 quic_supported_versions.push_back(QUIC_VERSION_35);
132 } 132 }
133 133
134 HttpNetworkSession::Params::Params(const Params& other) = default; 134 HttpNetworkSession::Params::Params(const Params& other) = default;
135 135
136 HttpNetworkSession::Params::~Params() {} 136 HttpNetworkSession::Params::~Params() {}
137 137
138 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. 138 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
139 HttpNetworkSession::HttpNetworkSession(const Params& params) 139 HttpNetworkSession::HttpNetworkSession(const Params& params)
140 : net_log_(params.net_log), 140 : net_log_(params.net_log),
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 break; 418 break;
419 case base::MemoryState::SUSPENDED: 419 case base::MemoryState::SUSPENDED:
420 // Note: Not supported at present. Fall through. 420 // Note: Not supported at present. Fall through.
421 case base::MemoryState::UNKNOWN: 421 case base::MemoryState::UNKNOWN:
422 NOTREACHED(); 422 NOTREACHED();
423 break; 423 break;
424 } 424 }
425 } 425 }
426 426
427 } // namespace net 427 } // namespace net
OLDNEW
« no previous file with comments | « chrome/browser/net/errorpage_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698