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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_protocol_test.cc

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 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
« net/socket/ssl_client_socket_openssl.cc ('K') | « net/socket/ssl_client_socket_openssl.cc ('k') | third_party/protobuf/config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_protocol_test.cc
diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc
index e6e378fcd2456ecee4177366144ed472acd3b916..33372447b720f339008942d0b693525312d7bdec 100644
--- a/net/spdy/spdy_protocol_test.cc
+++ b/net/spdy/spdy_protocol_test.cc
@@ -238,7 +238,7 @@ TEST(SpdyProtocolDeathTest, TestDataFrame) {
frame.set_stream_id(0);
// TODO(mbelshe): implement EXPECT_DEBUG_DEATH on windows.
-#ifndef WIN32
+#if !defined(WIN32) and GTEST_HAS_DEATH_TEST
#if !defined(DCHECK_ALWAYS_ON)
EXPECT_DEBUG_DEATH(frame.set_stream_id(~0), "");
#else
@@ -248,7 +248,7 @@ TEST(SpdyProtocolDeathTest, TestDataFrame) {
EXPECT_FALSE(frame.is_control_frame());
frame.set_flags(0);
-#ifndef WIN32
+#if !defined(WIN32) and GTEST_HAS_DEATH_TEST
#if !defined(DCHECK_ALWAYS_ON)
EXPECT_DEBUG_DEATH(frame.set_length(~0), "");
#else
« net/socket/ssl_client_socket_openssl.cc ('K') | « net/socket/ssl_client_socket_openssl.cc ('k') | third_party/protobuf/config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698