diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 22:17:27 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 22:17:27 +0000 |
| commit | 5c63806e0751f1c6ee95f460fdd1fee2d342c32b (patch) | |
| tree | 49bc0e2ddcd1089140c08ef55b0367a27d4018e9 /media | |
| parent | 6f6e682b84d45cc3901bf05d976531ce2c067d30 (diff) | |
| download | chromium_src-5c63806e0751f1c6ee95f460fdd1fee2d342c32b.zip chromium_src-5c63806e0751f1c6ee95f460fdd1fee2d342c32b.tar.gz chromium_src-5c63806e0751f1c6ee95f460fdd1fee2d342c32b.tar.bz2 | |
Make WaitableMessageLoopEvent return immediately if it has already been signaled.
This behaviour better represents the expected behvaiour of waiting on an already-signaled WaitableEvent as opposed to crashing in debug mode.
BUG=109405
Review URL: https://codereview.chromium.org/11622004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/test_helpers.cc | 6 | ||||
| -rw-r--r-- | media/filters/video_renderer_base_unittest.cc | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc index 862c9d4..ace54d7 100644 --- a/media/base/test_helpers.cc +++ b/media/base/test_helpers.cc @@ -73,11 +73,15 @@ void WaitableMessageLoopEvent::RunAndWait() { void WaitableMessageLoopEvent::RunAndWaitForStatus(PipelineStatus expected) { DCHECK_EQ(message_loop_, MessageLoop::current()); + if (signaled_) { + EXPECT_EQ(expected, status_); + return; + } + base::Timer timer(false, false); timer.Start(FROM_HERE, TestTimeouts::action_timeout(), base::Bind( &WaitableMessageLoopEvent::OnTimeout, base::Unretained(this))); - DCHECK(!signaled_) << "Already signaled"; message_loop_->Run(); EXPECT_TRUE(signaled_); EXPECT_EQ(expected, status_); diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc index 8662b8c..961243b 100644 --- a/media/filters/video_renderer_base_unittest.cc +++ b/media/filters/video_renderer_base_unittest.cc @@ -491,13 +491,7 @@ TEST_F(VideoRendererBaseTest, GetCurrentFrame_Flushed) { Shutdown(); } -#if defined(OS_MACOSX) || defined(ADDRESS_SANITIZER) || defined(OS_WIN) -// http://crbug.com/109405 -#define MAYBE_GetCurrentFrame_EndOfStream DISABLED_GetCurrentFrame_EndOfStream -#else -#define MAYBE_GetCurrentFrame_EndOfStream GetCurrentFrame_EndOfStream -#endif -TEST_F(VideoRendererBaseTest, MAYBE_GetCurrentFrame_EndOfStream) { +TEST_F(VideoRendererBaseTest, GetCurrentFrame_EndOfStream) { Initialize(); Play(); Pause(); |