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

Side by Side Diff: media/base/pipeline_unittest.cc

Issue 290003004: Remove FakeTextTrackStream::OnRead() spam when running Pipeline tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/test/simple_test_tick_clock.h" 10 #include "base/test/simple_test_tick_clock.h"
11 #include "base/threading/simple_thread.h" 11 #include "base/threading/simple_thread.h"
12 #include "base/time/clock.h" 12 #include "base/time/clock.h"
13 #include "media/base/clock.h" 13 #include "media/base/clock.h"
14 #include "media/base/fake_text_track_stream.h" 14 #include "media/base/fake_text_track_stream.h"
15 #include "media/base/gmock_callback_support.h" 15 #include "media/base/gmock_callback_support.h"
16 #include "media/base/media_log.h" 16 #include "media/base/media_log.h"
17 #include "media/base/mock_filters.h" 17 #include "media/base/mock_filters.h"
18 #include "media/base/pipeline.h" 18 #include "media/base/pipeline.h"
19 #include "media/base/test_helpers.h" 19 #include "media/base/test_helpers.h"
20 #include "media/base/text_renderer.h" 20 #include "media/base/text_renderer.h"
21 #include "media/base/text_track_config.h" 21 #include "media/base/text_track_config.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 #include "ui/gfx/size.h" 23 #include "ui/gfx/size.h"
24 24
25 using ::testing::_; 25 using ::testing::_;
26 using ::testing::AnyNumber;
26 using ::testing::DeleteArg; 27 using ::testing::DeleteArg;
27 using ::testing::DoAll; 28 using ::testing::DoAll;
28 // TODO(scherkus): Remove InSequence after refactoring Pipeline. 29 // TODO(scherkus): Remove InSequence after refactoring Pipeline.
29 using ::testing::InSequence; 30 using ::testing::InSequence;
30 using ::testing::Invoke; 31 using ::testing::Invoke;
31 using ::testing::InvokeWithoutArgs; 32 using ::testing::InvokeWithoutArgs;
32 using ::testing::Mock; 33 using ::testing::Mock;
33 using ::testing::NotNull; 34 using ::testing::NotNull;
34 using ::testing::Return; 35 using ::testing::Return;
35 using ::testing::SaveArg; 36 using ::testing::SaveArg;
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 void CreateAudioStream() { 234 void CreateAudioStream() {
234 audio_stream_ = CreateStream(DemuxerStream::AUDIO); 235 audio_stream_ = CreateStream(DemuxerStream::AUDIO);
235 } 236 }
236 237
237 void CreateVideoStream() { 238 void CreateVideoStream() {
238 video_stream_ = CreateStream(DemuxerStream::VIDEO); 239 video_stream_ = CreateStream(DemuxerStream::VIDEO);
239 video_stream_->set_video_decoder_config(video_decoder_config_); 240 video_stream_->set_video_decoder_config(video_decoder_config_);
240 } 241 }
241 242
242 void CreateTextStream() { 243 void CreateTextStream() {
243 scoped_ptr<FakeTextTrackStream> text_stream(new FakeTextTrackStream); 244 scoped_ptr<FakeTextTrackStream> text_stream(new FakeTextTrackStream());
245 EXPECT_CALL(*text_stream, OnRead()).Times(AnyNumber());
244 text_stream_ = text_stream.Pass(); 246 text_stream_ = text_stream.Pass();
245 } 247 }
246 248
247 MockDemuxerStream* audio_stream() { 249 MockDemuxerStream* audio_stream() {
248 return audio_stream_.get(); 250 return audio_stream_.get();
249 } 251 }
250 252
251 MockDemuxerStream* video_stream() { 253 MockDemuxerStream* video_stream() {
252 return video_stream_.get(); 254 return video_stream_.get();
253 } 255 }
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 INSTANTIATE_TEARDOWN_TEST(Error, InitVideoRenderer); 1170 INSTANTIATE_TEARDOWN_TEST(Error, InitVideoRenderer);
1169 INSTANTIATE_TEARDOWN_TEST(Error, Pausing); 1171 INSTANTIATE_TEARDOWN_TEST(Error, Pausing);
1170 INSTANTIATE_TEARDOWN_TEST(Error, Flushing); 1172 INSTANTIATE_TEARDOWN_TEST(Error, Flushing);
1171 INSTANTIATE_TEARDOWN_TEST(Error, Seeking); 1173 INSTANTIATE_TEARDOWN_TEST(Error, Seeking);
1172 INSTANTIATE_TEARDOWN_TEST(Error, Prerolling); 1174 INSTANTIATE_TEARDOWN_TEST(Error, Prerolling);
1173 INSTANTIATE_TEARDOWN_TEST(Error, Playing); 1175 INSTANTIATE_TEARDOWN_TEST(Error, Playing);
1174 1176
1175 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Playing); 1177 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Playing);
1176 1178
1177 } // namespace media 1179 } // namespace media
OLDNEW
« 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