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

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

Issue 710713002: Remove SPDY2 and SPDY/3.0 from tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_websocket_stream.h" 5 #include "net/spdy/spdy_websocket_stream.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 285
286 static const char kMessageFrame[]; 286 static const char kMessageFrame[];
287 static const char kClosingFrame[]; 287 static const char kClosingFrame[];
288 static const size_t kMessageFrameLength; 288 static const size_t kMessageFrameLength;
289 static const size_t kClosingFrameLength; 289 static const size_t kClosingFrameLength;
290 }; 290 };
291 291
292 INSTANTIATE_TEST_CASE_P( 292 INSTANTIATE_TEST_CASE_P(
293 NextProto, 293 NextProto,
294 SpdyWebSocketStreamTest, 294 SpdyWebSocketStreamTest,
295 testing::Values(kProtoDeprecatedSPDY2, 295 testing::Values(kProtoSPDY31, kProtoSPDY4));
296 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));
297 296
298 // TODO(toyoshim): Replace old framing data to new one, then use HEADERS and 297 // TODO(toyoshim): Replace old framing data to new one, then use HEADERS and
299 // data frames. 298 // data frames.
300 const char SpdyWebSocketStreamTest::kMessageFrame[] = "\x81\x05hello"; 299 const char SpdyWebSocketStreamTest::kMessageFrame[] = "\x81\x05hello";
301 const char SpdyWebSocketStreamTest::kClosingFrame[] = "\x88\0"; 300 const char SpdyWebSocketStreamTest::kClosingFrame[] = "\x88\0";
302 const size_t SpdyWebSocketStreamTest::kMessageFrameLength = 301 const size_t SpdyWebSocketStreamTest::kMessageFrameLength =
303 arraysize(SpdyWebSocketStreamTest::kMessageFrame) - 1; 302 arraysize(SpdyWebSocketStreamTest::kMessageFrame) - 1;
304 const size_t SpdyWebSocketStreamTest::kClosingFrameLength = 303 const size_t SpdyWebSocketStreamTest::kClosingFrameLength =
305 arraysize(SpdyWebSocketStreamTest::kClosingFrame) - 1; 304 arraysize(SpdyWebSocketStreamTest::kClosingFrame) - 1;
306 305
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 EXPECT_EQ(OK, events[7].result); 659 EXPECT_EQ(OK, events[7].result);
661 660
662 // EOF close SPDY session. 661 // EOF close SPDY session.
663 EXPECT_FALSE( 662 EXPECT_FALSE(
664 HasSpdySession(http_session_->spdy_session_pool(), spdy_session_key_)); 663 HasSpdySession(http_session_->spdy_session_pool(), spdy_session_key_));
665 EXPECT_TRUE(data.at_read_eof()); 664 EXPECT_TRUE(data.at_read_eof());
666 EXPECT_TRUE(data.at_write_eof()); 665 EXPECT_TRUE(data.at_write_eof());
667 } 666 }
668 667
669 } // namespace net 668 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698