summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_throttler_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/url_request/url_request_throttler_unittest.cc')
-rw-r--r--net/url_request/url_request_throttler_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/url_request/url_request_throttler_unittest.cc b/net/url_request/url_request_throttler_unittest.cc
index a281564..7d4e739 100644
--- a/net/url_request/url_request_throttler_unittest.cc
+++ b/net/url_request/url_request_throttler_unittest.cc
@@ -403,7 +403,8 @@ TEST(URLRequestThrottlerManager, StressTest) {
}
}
-#if defined(GTEST_HAS_DEATH_TEST)
+// TODO(joi): Remove the debug-only condition after M11 branch point.
+#if defined(GTEST_HAS_DEATH_TEST) && !defined(NDEBUG)
TEST(URLRequestThrottlerManager, NullHandlingTest) {
MockURLRequestThrottlerManager manager;
manager.OverrideEntryForTests(GURL("http://www.foo.com/"), NULL);
@@ -411,4 +412,4 @@ TEST(URLRequestThrottlerManager, NullHandlingTest) {
manager.DoGarbageCollectEntries();
}, "");
}
-#endif // defined(GTEST_HAS_DEATH_TEST)
+#endif // defined(GTEST_HAS_DEATH_TEST) && !defined(NDEBUG)