| OLD | NEW |
| 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_chromium_client_session.h" | 5 #include "net/quic/quic_chromium_client_session.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1133 | 1133 |
| 1134 going_away_ = true; | 1134 going_away_ = true; |
| 1135 DCHECK_EQ(0u, GetNumActiveStreams()); | 1135 DCHECK_EQ(0u, GetNumActiveStreams()); |
| 1136 // Will delete |this|. | 1136 // Will delete |this|. |
| 1137 if (stream_factory_) | 1137 if (stream_factory_) |
| 1138 stream_factory_->OnSessionClosed(this); | 1138 stream_factory_->OnSessionClosed(this); |
| 1139 } | 1139 } |
| 1140 | 1140 |
| 1141 void QuicChromiumClientSession::OnConnectTimeout() { | 1141 void QuicChromiumClientSession::OnConnectTimeout() { |
| 1142 DCHECK(callback_.is_null()); | 1142 DCHECK(callback_.is_null()); |
| 1143 DCHECK(IsEncryptionEstablished()); | |
| 1144 | 1143 |
| 1145 if (IsCryptoHandshakeConfirmed()) | 1144 if (IsCryptoHandshakeConfirmed()) |
| 1146 return; | 1145 return; |
| 1147 | 1146 |
| 1148 // TODO(rch): re-enable this code once beta is cut. | 1147 // TODO(rch): re-enable this code once beta is cut. |
| 1149 // if (stream_factory_) | 1148 // if (stream_factory_) |
| 1150 // stream_factory_->OnSessionConnectTimeout(this); | 1149 // stream_factory_->OnSessionConnectTimeout(this); |
| 1151 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED); | 1150 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED); |
| 1152 // DCHECK_EQ(0u, GetNumOpenOutgoingStreams()); | 1151 // DCHECK_EQ(0u, GetNumOpenOutgoingStreams()); |
| 1153 } | 1152 } |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1206 } | 1205 } |
| 1207 | 1206 |
| 1208 void QuicChromiumClientSession::DeletePromised( | 1207 void QuicChromiumClientSession::DeletePromised( |
| 1209 QuicClientPromisedInfo* promised) { | 1208 QuicClientPromisedInfo* promised) { |
| 1210 if (IsOpenStream(promised->id())) | 1209 if (IsOpenStream(promised->id())) |
| 1211 streams_pushed_and_claimed_count_++; | 1210 streams_pushed_and_claimed_count_++; |
| 1212 QuicClientSessionBase::DeletePromised(promised); | 1211 QuicClientSessionBase::DeletePromised(promised); |
| 1213 } | 1212 } |
| 1214 | 1213 |
| 1215 } // namespace net | 1214 } // namespace net |
| OLD | NEW |