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

Side by Side Diff: net/quic/quic_client_session.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/quic/quic_ack_notifier_test.cc ('k') | net/quic/quic_config.cc » ('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) 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/quic/quic_client_session.h" 5 #include "net/quic/quic_client_session.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/metrics/sparse_histogram.h" 10 #include "base/metrics/sparse_histogram.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 server_info_(server_info.Pass()), 170 server_info_(server_info.Pass()),
171 read_pending_(false), 171 read_pending_(false),
172 num_total_streams_(0), 172 num_total_streams_(0),
173 task_runner_(task_runner), 173 task_runner_(task_runner),
174 net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_QUIC_SESSION)), 174 net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_QUIC_SESSION)),
175 logger_(new QuicConnectionLogger(this, net_log_)), 175 logger_(new QuicConnectionLogger(this, net_log_)),
176 num_packets_read_(0), 176 num_packets_read_(0),
177 going_away_(false), 177 going_away_(false),
178 weak_factory_(this) { 178 weak_factory_(this) {
179 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed. 179 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
180 tracked_objects::ScopedTracker tracking_profile( 180 tracked_objects::ScopedTracker tracking_profile1(
181 FROM_HERE_WITH_EXPLICIT_FUNCTION( 181 FROM_HERE_WITH_EXPLICIT_FUNCTION(
182 "422516 QuicClientSession::QuicClientSession")); 182 "422516 QuicClientSession::QuicClientSession1"));
183 183
184 connection->set_debug_visitor(logger_); 184 connection->set_debug_visitor(logger_);
185 IPEndPoint address; 185 IPEndPoint address;
186 // TODO(rtenneti): Remove ScopedTracker below once crbug.com/422516 is fixed.
187 tracked_objects::ScopedTracker tracking_profile2(
188 FROM_HERE_WITH_EXPLICIT_FUNCTION(
189 "422516 QuicClientSession::QuicClientSession2"));
186 if (socket && socket->GetLocalAddress(&address) == OK && 190 if (socket && socket->GetLocalAddress(&address) == OK &&
187 address.GetFamily() == ADDRESS_FAMILY_IPV6) { 191 address.GetFamily() == ADDRESS_FAMILY_IPV6) {
188 connection->set_max_packet_length( 192 connection->set_max_packet_length(
189 connection->max_packet_length() - kAdditionalOverheadForIPv6); 193 connection->max_packet_length() - kAdditionalOverheadForIPv6);
190 } 194 }
191 } 195 }
192 196
193 void QuicClientSession::InitializeSession( 197 void QuicClientSession::InitializeSession(
194 const QuicServerId& server_id, 198 const QuicServerId& server_id,
195 QuicCryptoClientConfig* crypto_config, 199 QuicCryptoClientConfig* crypto_config,
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
942 return; 946 return;
943 947
944 // TODO(rch): re-enable this code once beta is cut. 948 // TODO(rch): re-enable this code once beta is cut.
945 // if (stream_factory_) 949 // if (stream_factory_)
946 // stream_factory_->OnSessionConnectTimeout(this); 950 // stream_factory_->OnSessionConnectTimeout(this);
947 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED); 951 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED);
948 // DCHECK_EQ(0u, GetNumOpenStreams()); 952 // DCHECK_EQ(0u, GetNumOpenStreams());
949 } 953 }
950 954
951 } // namespace net 955 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_ack_notifier_test.cc ('k') | net/quic/quic_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698