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

Unified Diff: net/spdy/spdy_framer_test.cc

Issue 11194068: Linux: fix build with system zlib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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/spdy_framer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_framer_test.cc
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index fc78e20b15ad549ca3e1468009d0b53f299ae8fc..a88690a0560b0b124778253bbd0e114565ff272c 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -1669,6 +1669,9 @@ TEST_P(SpdyFramerTest, CreateSynStreamUncompressed) {
}
}
+// TODO(phajdan.jr): Clean up after we no longer need
+// to workaround http://crbug.com/139744.
+#if !defined(USE_SYSTEM_ZLIB)
TEST_P(SpdyFramerTest, CreateSynStreamCompressed) {
SpdyFramer framer(spdy_version_);
framer.set_enable_compression(true);
@@ -1732,6 +1735,7 @@ TEST_P(SpdyFramerTest, CreateSynStreamCompressed) {
IsSpdy2() ? arraysize(kV2FrameData) : arraysize(kV3FrameData));
}
}
+#endif // !defined(USE_SYSTEM_ZLIB)
TEST_P(SpdyFramerTest, CreateSynReplyUncompressed) {
SpdyFramer framer(spdy_version_);
@@ -1857,6 +1861,9 @@ TEST_P(SpdyFramerTest, CreateSynReplyUncompressed) {
}
}
+// TODO(phajdan.jr): Clean up after we no longer need
+// to workaround http://crbug.com/139744.
+#if !defined(USE_SYSTEM_ZLIB)
TEST_P(SpdyFramerTest, CreateSynReplyCompressed) {
SpdyFramer framer(spdy_version_);
framer.set_enable_compression(true);
@@ -1910,6 +1917,7 @@ TEST_P(SpdyFramerTest, CreateSynReplyCompressed) {
IsSpdy2() ? arraysize(kV2FrameData) : arraysize(kV3FrameData));
}
}
+#endif // !defined(USE_SYSTEM_ZLIB)
TEST_P(SpdyFramerTest, CreateRstStream) {
SpdyFramer framer(spdy_version_);
@@ -2249,6 +2257,9 @@ TEST_P(SpdyFramerTest, CreateHeadersUncompressed) {
}
}
+// TODO(phajdan.jr): Clean up after we no longer need
+// to workaround http://crbug.com/139744.
+#if !defined(USE_SYSTEM_ZLIB)
TEST_P(SpdyFramerTest, CreateHeadersCompressed) {
SpdyFramer framer(spdy_version_);
framer.set_enable_compression(true);
@@ -2302,6 +2313,7 @@ TEST_P(SpdyFramerTest, CreateHeadersCompressed) {
IsSpdy2() ? arraysize(kV2FrameData) : arraysize(kV3FrameData));
}
}
+#endif // !defined(USE_SYSTEM_ZLIB)
TEST_P(SpdyFramerTest, CreateWindowUpdate) {
SpdyFramer framer(spdy_version_);
« no previous file with comments | « net/spdy/spdy_framer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698