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

Unified Diff: net/spdy/buffered_spdy_framer_spdy3_unittest.cc

Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge bug Created 8 years, 10 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/buffered_spdy_framer_spdy2_unittest.cc ('k') | net/spdy/buffered_spdy_framer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/buffered_spdy_framer_spdy3_unittest.cc
===================================================================
--- net/spdy/buffered_spdy_framer_spdy3_unittest.cc (revision 124690)
+++ net/spdy/buffered_spdy_framer_spdy3_unittest.cc (working copy)
@@ -4,12 +4,14 @@
#include "net/spdy/buffered_spdy_framer.h"
-#include "net/spdy/spdy_test_util.h"
+#include "net/spdy/spdy_test_util_spdy3.h"
#include "testing/platform_test.h"
+using namespace net::test_spdy3;
+
namespace spdy {
-namespace test {
+namespace {
class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface {
public:
@@ -131,15 +133,9 @@
SpdyHeaderBlock headers_;
};
-} // namespace test
+} // namespace
-} // namespace spdy
-
-using spdy::test::TestBufferedSpdyVisitor;
-
-namespace spdy {
-
-class BufferedSpdyFramerTest : public PlatformTest {
+class BufferedSpdyFramerSpdy3Test : public PlatformTest {
protected:
void EnableCompression(bool enabled) {
SpdyFramer::set_enable_compression_default(enabled);
@@ -173,7 +169,7 @@
}
};
-TEST_F(BufferedSpdyFramerTest, ReadSynStreamHeaderBlock) {
+TEST_F(BufferedSpdyFramerSpdy3Test, ReadSynStreamHeaderBlock) {
EnableCompression(false);
SpdyHeaderBlock headers;
@@ -200,7 +196,7 @@
EXPECT_TRUE(CompareHeaderBlocks(&headers, &visitor.headers_));
}
-TEST_F(BufferedSpdyFramerTest, ReadSynReplyHeaderBlock) {
+TEST_F(BufferedSpdyFramerSpdy3Test, ReadSynReplyHeaderBlock) {
EnableCompression(false);
SpdyHeaderBlock headers;
@@ -225,7 +221,7 @@
EXPECT_TRUE(CompareHeaderBlocks(&headers, &visitor.headers_));
}
-TEST_F(BufferedSpdyFramerTest, ReadHeadersHeaderBlock) {
+TEST_F(BufferedSpdyFramerSpdy3Test, ReadHeadersHeaderBlock) {
EnableCompression(false);
SpdyHeaderBlock headers;
« no previous file with comments | « net/spdy/buffered_spdy_framer_spdy2_unittest.cc ('k') | net/spdy/buffered_spdy_framer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698