diff options
| author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 16:09:12 +0000 |
|---|---|---|
| committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-15 16:09:12 +0000 |
| commit | 8d2a4251d9f9fd0c812a4b60a54720802a08fd41 (patch) | |
| tree | e3bc187b3deb2bc5882db3862f2c3bb740704c31 /content/browser | |
| parent | ce6ee68a92b0616b413523ae21880db69565bb01 (diff) | |
| download | chromium_src-8d2a4251d9f9fd0c812a4b60a54720802a08fd41.zip chromium_src-8d2a4251d9f9fd0c812a4b60a54720802a08fd41.tar.gz chromium_src-8d2a4251d9f9fd0c812a4b60a54720802a08fd41.tar.bz2 | |
The test can get flaky due to timing issue on Android.
BUG=142869,140441
TEST=content_unittests
Review URL: https://chromiumcodereview.appspot.com/10830335
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc index e5b31ee..eb56bd9 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc @@ -372,13 +372,13 @@ TEST_F(MediaStreamDispatcherHostTest, StopGeneratedStreamsOnChannelClosing) { size_t generated_streams = 3; for (size_t i = 0; i < generated_streams; ++i) { EXPECT_CALL(*host_, OnStreamGenerated(kRenderId, kPageRequestId + i, 0, 1)); + EXPECT_CALL(*media_observer_.get(), OnCaptureDevicesOpened(_, _, _)); host_->OnGenerateStream(kPageRequestId + i, options); + + // Wait until the stream is generated. + WaitForResult(); } EXPECT_EQ(host_->NumberOfStreams(), generated_streams); - EXPECT_CALL(*media_observer_.get(), OnCaptureDevicesOpened(_, _, _)) - .Times(3); - // Wait until the streams are all generated. - WaitForResult(); // Calling OnChannelClosing() to cancel all the pending/generated streams. EXPECT_CALL(*media_observer_.get(), OnCaptureDevicesClosed(_, _, _)) |