From dc0f95d653279beabeb9817299e2902918ba123e Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Thu, 9 Jun 2011 11:47:42 +0100 Subject: Merge Chromium at r11.0.696.0: Initial merge by git Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d --- googleurl/src/url_canon_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'googleurl') diff --git a/googleurl/src/url_canon_unittest.cc b/googleurl/src/url_canon_unittest.cc index 1a3cd53..bc9536e 100644 --- a/googleurl/src/url_canon_unittest.cc +++ b/googleurl/src/url_canon_unittest.cc @@ -169,7 +169,7 @@ TEST(URLCanonTest, DoAppendUTF8) { // TODO(mattm): Can't run this in debug mode for now, since the DCHECK will // cause the Chromium stacktrace dialog to appear and hang the test. // See http://crbug.com/49580. -#ifdef NDEBUG +#if defined(GTEST_HAS_DEATH_TEST) && defined(NDEBUG) TEST(URLCanonTest, DoAppendUTF8Invalid) { std::string out_str; url_canon::StdStringCanonOutput output(&out_str); -- cgit v1.1