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/spdy/spdy_http_stream.h" | 5 #include "net/spdy/spdy_http_stream.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 scoped_refptr<HttpNetworkSession> http_session_; | 123 scoped_refptr<HttpNetworkSession> http_session_; |
124 base::WeakPtr<SpdySession> session_; | 124 base::WeakPtr<SpdySession> session_; |
125 | 125 |
126 private: | 126 private: |
127 MockECSignatureCreatorFactory ec_signature_creator_factory_; | 127 MockECSignatureCreatorFactory ec_signature_creator_factory_; |
128 }; | 128 }; |
129 | 129 |
130 INSTANTIATE_TEST_CASE_P( | 130 INSTANTIATE_TEST_CASE_P( |
131 NextProto, | 131 NextProto, |
132 SpdyHttpStreamTest, | 132 SpdyHttpStreamTest, |
133 testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2, | 133 testing::Values(kProtoDeprecatedSPDY2, |
| 134 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2, |
134 kProtoHTTP2Draft04)); | 135 kProtoHTTP2Draft04)); |
135 | 136 |
136 // SpdyHttpStream::GetUploadProgress() should still work even before the | 137 // SpdyHttpStream::GetUploadProgress() should still work even before the |
137 // stream is initialized. | 138 // stream is initialized. |
138 TEST_P(SpdyHttpStreamTest, GetUploadProgressBeforeInitialization) { | 139 TEST_P(SpdyHttpStreamTest, GetUploadProgressBeforeInitialization) { |
139 MockRead reads[] = { | 140 MockRead reads[] = { |
140 MockRead(ASYNC, 0, 0) // EOF | 141 MockRead(ASYNC, 0, 0) // EOF |
141 }; | 142 }; |
142 | 143 |
143 HostPortPair host_port_pair("www.google.com", 80); | 144 HostPortPair host_port_pair("www.google.com", 80); |
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
882 ASSERT_EQ(200, response.headers->response_code()); | 883 ASSERT_EQ(200, response.headers->response_code()); |
883 deterministic_data_->RunFor(1); | 884 deterministic_data_->RunFor(1); |
884 } | 885 } |
885 | 886 |
886 #endif // !defined(USE_OPENSSL) | 887 #endif // !defined(USE_OPENSSL) |
887 | 888 |
888 // TODO(willchan): Write a longer test for SpdyStream that exercises all | 889 // TODO(willchan): Write a longer test for SpdyStream that exercises all |
889 // methods. | 890 // methods. |
890 | 891 |
891 } // namespace net | 892 } // namespace net |
OLD | NEW |