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

Unified Diff: mojo/public/cpp/bindings/tests/binding_callback_unittest.cc

Issue 1991233002: [Android] Disable death check in BindingCallbackTest.DeleteCallbackBeforeBindingDeathTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/bindings/tests/binding_callback_unittest.cc
diff --git a/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc b/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc
index 34a28b775bd726ce191596ffc60aa1c42b5f3b15..e6bdfa9a59d9cc9b5491133b22b7d8f7d1c66ef3 100644
--- a/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/binding_callback_unittest.cc
@@ -334,7 +334,7 @@ TEST_F(BindingCallbackTest, DeleteCallbackBeforeBindingDeathTest) {
EXPECT_EQ(7, server_impl.last_server_value_seen());
EXPECT_EQ(0, last_client_callback_value_seen_);
-#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
+#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && !defined(OS_ANDROID)
// Delete the callback without running it. This should cause a crash in debug
// builds due to a DCHECK.
std::string regex("Check failed: !is_valid");
@@ -343,7 +343,8 @@ TEST_F(BindingCallbackTest, DeleteCallbackBeforeBindingDeathTest) {
regex.clear();
#endif // OS_WIN
EXPECT_DEATH_IF_SUPPORTED(server_impl.DeleteCallback(), regex.c_str());
-#endif // !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
+#endif // (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) &&
+ // !defined(OS_ANDROID)
}
} // namespace
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698