| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 return maker_.MakeDataPacket( | 166 return maker_.MakeDataPacket( |
| 167 sequence_number, stream_id, should_include_version, fin, offset, data); | 167 sequence_number, stream_id, should_include_version, fin, offset, data); |
| 168 } | 168 } |
| 169 | 169 |
| 170 scoped_ptr<QuicEncryptedPacket> ConstructRequestHeadersPacket( | 170 scoped_ptr<QuicEncryptedPacket> ConstructRequestHeadersPacket( |
| 171 QuicPacketSequenceNumber sequence_number, | 171 QuicPacketSequenceNumber sequence_number, |
| 172 QuicStreamId stream_id, | 172 QuicStreamId stream_id, |
| 173 bool should_include_version, | 173 bool should_include_version, |
| 174 bool fin, | 174 bool fin, |
| 175 const SpdyHeaderBlock& headers) { | 175 const SpdyHeaderBlock& headers) { |
| 176 return maker_.MakeRequestHeadersPacket( | 176 QuicPriority priority = |
| 177 sequence_number, stream_id, should_include_version, fin, headers); | 177 ConvertRequestPriorityToQuicPriority(DEFAULT_PRIORITY); |
| 178 return maker_.MakeRequestHeadersPacket(sequence_number, stream_id, |
| 179 should_include_version, fin, |
| 180 priority, headers); |
| 178 } | 181 } |
| 179 | 182 |
| 180 scoped_ptr<QuicEncryptedPacket> ConstructResponseHeadersPacket( | 183 scoped_ptr<QuicEncryptedPacket> ConstructResponseHeadersPacket( |
| 181 QuicPacketSequenceNumber sequence_number, | 184 QuicPacketSequenceNumber sequence_number, |
| 182 QuicStreamId stream_id, | 185 QuicStreamId stream_id, |
| 183 bool should_include_version, | 186 bool should_include_version, |
| 184 bool fin, | 187 bool fin, |
| 185 const SpdyHeaderBlock& headers) { | 188 const SpdyHeaderBlock& headers) { |
| 186 return maker_.MakeResponseHeadersPacket( | 189 return maker_.MakeResponseHeadersPacket( |
| 187 sequence_number, stream_id, should_include_version, fin, headers); | 190 sequence_number, stream_id, should_include_version, fin, headers); |
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1032 nullptr, | 1035 nullptr, |
| 1033 net_log_.bound()); | 1036 net_log_.bound()); |
| 1034 | 1037 |
| 1035 CreateSessionWithNextProtos(); | 1038 CreateSessionWithNextProtos(); |
| 1036 AddQuicAlternateProtocolMapping(MockCryptoClientStream::ZERO_RTT); | 1039 AddQuicAlternateProtocolMapping(MockCryptoClientStream::ZERO_RTT); |
| 1037 SendRequestAndExpectHttpResponse("hello world"); | 1040 SendRequestAndExpectHttpResponse("hello world"); |
| 1038 } | 1041 } |
| 1039 | 1042 |
| 1040 } // namespace test | 1043 } // namespace test |
| 1041 } // namespace net | 1044 } // namespace net |
| OLD | NEW |