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

Side by Side Diff: content/renderer/media/rtc_video_decoder_unittest.cc

Issue 11316293: Replace WaitableEvents and ConditionalVariables in VideoRendererBase tests with MessageLoop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bustage Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/mock_callback.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/rtc_video_decoder.h" 5 #include "content/renderer/media/rtc_video_decoder.h"
6 6
7 #include <deque> 7 #include <deque>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "media/base/data_buffer.h" 13 #include "media/base/data_buffer.h"
14 #include "media/base/limits.h" 14 #include "media/base/limits.h"
15 #include "media/base/mock_callback.h"
16 #include "media/base/mock_filters.h" 15 #include "media/base/mock_filters.h"
16 #include "media/base/test_helpers.h"
17 #include "media/base/video_frame.h" 17 #include "media/base/video_frame.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 #include "third_party/libjingle/source/talk/media/base/videoframe.h" 19 #include "third_party/libjingle/source/talk/media/base/videoframe.h"
20 20
21 using ::testing::_; 21 using ::testing::_;
22 using ::testing::AnyNumber; 22 using ::testing::AnyNumber;
23 using ::testing::DoAll; 23 using ::testing::DoAll;
24 using ::testing::Message; 24 using ::testing::Message;
25 using ::testing::Return; 25 using ::testing::Return;
26 using ::testing::ReturnNull; 26 using ::testing::ReturnNull;
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 Stop(); 331 Stop();
332 332
333 // Any read after stopping should be immediately satisfied. 333 // Any read after stopping should be immediately satisfied.
334 EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk, 334 EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk,
335 scoped_refptr<media::VideoFrame>())); 335 scoped_refptr<media::VideoFrame>()));
336 decoder_->Read(read_cb_); 336 decoder_->Read(read_cb_);
337 message_loop_.RunUntilIdle(); 337 message_loop_.RunUntilIdle();
338 } 338 }
339 339
340 } // namespace content 340 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/mock_callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698