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

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

Issue 734063004: Update from https://crrev.com/304418 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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_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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 ResetAndReturn(&callback_).Run(rv); 148 ResetAndReturn(&callback_).Run(rv);
149 } 149 }
150 150
151 QuicClientSession::QuicClientSession( 151 QuicClientSession::QuicClientSession(
152 QuicConnection* connection, 152 QuicConnection* connection,
153 scoped_ptr<DatagramClientSocket> socket, 153 scoped_ptr<DatagramClientSocket> socket,
154 QuicStreamFactory* stream_factory, 154 QuicStreamFactory* stream_factory,
155 TransportSecurityState* transport_security_state, 155 TransportSecurityState* transport_security_state,
156 scoped_ptr<QuicServerInfo> server_info, 156 scoped_ptr<QuicServerInfo> server_info,
157 const QuicConfig& config, 157 const QuicConfig& config,
158 bool is_secure,
159 base::TaskRunner* task_runner, 158 base::TaskRunner* task_runner,
160 NetLog* net_log) 159 NetLog* net_log)
161 : QuicClientSessionBase(connection, config, is_secure), 160 : QuicClientSessionBase(connection, config),
162 require_confirmation_(false), 161 require_confirmation_(false),
163 stream_factory_(stream_factory), 162 stream_factory_(stream_factory),
164 socket_(socket.Pass()), 163 socket_(socket.Pass()),
165 read_buffer_(new IOBufferWithSize(kMaxPacketSize)), 164 read_buffer_(new IOBufferWithSize(kMaxPacketSize)),
166 transport_security_state_(transport_security_state), 165 transport_security_state_(transport_security_state),
167 server_info_(server_info.Pass()), 166 server_info_(server_info.Pass()),
168 read_pending_(false), 167 read_pending_(false),
169 num_total_streams_(0), 168 num_total_streams_(0),
170 task_runner_(task_runner), 169 task_runner_(task_runner),
171 net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_QUIC_SESSION)), 170 net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_QUIC_SESSION)),
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 return; 888 return;
890 889
891 // TODO(rch): re-enable this code once beta is cut. 890 // TODO(rch): re-enable this code once beta is cut.
892 // if (stream_factory_) 891 // if (stream_factory_)
893 // stream_factory_->OnSessionConnectTimeout(this); 892 // stream_factory_->OnSessionConnectTimeout(this);
894 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED); 893 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED);
895 // DCHECK_EQ(0u, GetNumOpenStreams()); 894 // DCHECK_EQ(0u, GetNumOpenStreams());
896 } 895 }
897 896
898 } // namespace net 897 } // 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