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

Unified Diff: ppapi/shared_impl/media_stream_buffer_manager_unittest.cc

Issue 1053013009: Make MediaStreamBufferManager.General pass in official builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 8 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: ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
diff --git a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
index 090cb2a36d6718874493c6e5b5c9efbb6f53be65..a7f0ec794ef3a513cd0bc09dedf5a2a574118988 100644
--- a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
+++ b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
@@ -84,10 +84,15 @@ TEST(MediaStreamBufferManager, General) {
EXPECT_EQ(NULL, manager.GetBufferPointer(kNumberOfBuffers));
// Test crash for passing invalid index to EnqueueBuffer().
- EXPECT_DEATH(manager.EnqueueBuffer(-1),
- ".*Check failed: index >= 0.*");
+ // String arguments aren't passed to CHECK() in official builds.
+#if defined(OFFICIAL_BUILD) && defined(NDEBUG)
+ EXPECT_DEATH(manager.EnqueueBuffer(-1), "");
+ EXPECT_DEATH(manager.EnqueueBuffer(kNumberOfBuffers), "");
+#else
+ EXPECT_DEATH(manager.EnqueueBuffer(-1), ".*Check failed: index >= 0.*");
EXPECT_DEATH(manager.EnqueueBuffer(kNumberOfBuffers),
".*Check failed: index < number_of_buffers_.*");
+#endif
}
{
« 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