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

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

Issue 330333006: Land Recent QUIC Changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linus_tsan error - reverted the change to ConnectionMigrationClientPortChanged unitttest Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/quic/quic_client_session.h ('k') | net/quic/quic_client_session_base.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) 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 133
134 QuicClientSession::QuicClientSession( 134 QuicClientSession::QuicClientSession(
135 QuicConnection* connection, 135 QuicConnection* connection,
136 scoped_ptr<DatagramClientSocket> socket, 136 scoped_ptr<DatagramClientSocket> socket,
137 scoped_ptr<QuicDefaultPacketWriter> writer, 137 scoped_ptr<QuicDefaultPacketWriter> writer,
138 QuicStreamFactory* stream_factory, 138 QuicStreamFactory* stream_factory,
139 QuicCryptoClientStreamFactory* crypto_client_stream_factory, 139 QuicCryptoClientStreamFactory* crypto_client_stream_factory,
140 scoped_ptr<QuicServerInfo> server_info, 140 scoped_ptr<QuicServerInfo> server_info,
141 const QuicServerId& server_id, 141 const QuicServerId& server_id,
142 const QuicConfig& config, 142 const QuicConfig& config,
143 uint32 max_flow_control_receive_window_bytes,
144 QuicCryptoClientConfig* crypto_config, 143 QuicCryptoClientConfig* crypto_config,
145 base::TaskRunner* task_runner, 144 base::TaskRunner* task_runner,
146 NetLog* net_log) 145 NetLog* net_log)
147 : QuicClientSessionBase(connection, 146 : QuicClientSessionBase(connection,
148 max_flow_control_receive_window_bytes,
149 config), 147 config),
150 require_confirmation_(false), 148 require_confirmation_(false),
151 stream_factory_(stream_factory), 149 stream_factory_(stream_factory),
152 socket_(socket.Pass()), 150 socket_(socket.Pass()),
153 writer_(writer.Pass()), 151 writer_(writer.Pass()),
154 read_buffer_(new IOBufferWithSize(kMaxPacketSize)), 152 read_buffer_(new IOBufferWithSize(kMaxPacketSize)),
155 server_info_(server_info.Pass()), 153 server_info_(server_info.Pass()),
156 read_pending_(false), 154 read_pending_(false),
157 num_total_streams_(0), 155 num_total_streams_(0),
158 task_runner_(task_runner), 156 task_runner_(task_runner),
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 835
838 if (IsCryptoHandshakeConfirmed()) 836 if (IsCryptoHandshakeConfirmed())
839 return; 837 return;
840 838
841 if (stream_factory_) 839 if (stream_factory_)
842 stream_factory_->OnSessionConnectTimeout(this); 840 stream_factory_->OnSessionConnectTimeout(this);
843 CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED); 841 CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED);
844 } 842 }
845 843
846 } // namespace net 844 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_client_session.h ('k') | net/quic/quic_client_session_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698