diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-09 11:47:42 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 14:33:03 +0100 |
| commit | dc0f95d653279beabeb9817299e2902918ba123e (patch) | |
| tree | 32eb121cd532053a5b9cb0c390331349af8d6baa /googleurl/src | |
| parent | ba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff) | |
| download | external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2 | |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'googleurl/src')
| -rw-r--r-- | googleurl/src/url_canon_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |