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

Side by Side Diff: net/spdy/spdy_http_stream_unittest.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@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
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/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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(kProtoDeprecatedSPDY2, 133 testing::Values(kProtoDeprecatedSPDY2,
134 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); 134 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15));
135 135
136 // SpdyHttpStream::GetUploadProgress() should still work even before the 136 // SpdyHttpStream::GetUploadProgress() should still work even before the
137 // stream is initialized. 137 // stream is initialized.
138 TEST_P(SpdyHttpStreamTest, GetUploadProgressBeforeInitialization) { 138 TEST_P(SpdyHttpStreamTest, GetUploadProgressBeforeInitialization) {
139 MockRead reads[] = { 139 MockRead reads[] = {
140 MockRead(ASYNC, 0, 0) // EOF 140 MockRead(ASYNC, 0, 0) // EOF
141 }; 141 };
142 142
143 HostPortPair host_port_pair("www.google.com", 80); 143 HostPortPair host_port_pair("www.google.com", 80);
144 SpdySessionKey key(host_port_pair, ProxyServer::Direct(), 144 SpdySessionKey key(host_port_pair, ProxyServer::Direct(),
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
786 ASSERT_TRUE(response.headers.get()); 786 ASSERT_TRUE(response.headers.get());
787 ASSERT_EQ(200, response.headers->response_code()); 787 ASSERT_EQ(200, response.headers->response_code());
788 EXPECT_TRUE(deterministic_data_->at_read_eof()); 788 EXPECT_TRUE(deterministic_data_->at_read_eof());
789 EXPECT_TRUE(deterministic_data_->at_write_eof()); 789 EXPECT_TRUE(deterministic_data_->at_write_eof());
790 } 790 }
791 791
792 // TODO(willchan): Write a longer test for SpdyStream that exercises all 792 // TODO(willchan): Write a longer test for SpdyStream that exercises all
793 // methods. 793 // methods.
794 794
795 } // namespace net 795 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_headers_block_parser_test.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698