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

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

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 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 unified diff | Download patch
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | media/base/stream_parser.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 "media/base/pipeline_impl.h" 5 #include "media/base/pipeline_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 MOCK_METHOD1(OnStart, void(PipelineStatus)); 91 MOCK_METHOD1(OnStart, void(PipelineStatus));
92 MOCK_METHOD1(OnSeek, void(PipelineStatus)); 92 MOCK_METHOD1(OnSeek, void(PipelineStatus));
93 MOCK_METHOD1(OnSuspend, void(PipelineStatus)); 93 MOCK_METHOD1(OnSuspend, void(PipelineStatus));
94 MOCK_METHOD1(OnResume, void(PipelineStatus)); 94 MOCK_METHOD1(OnResume, void(PipelineStatus));
95 95
96 private: 96 private:
97 DISALLOW_COPY_AND_ASSIGN(CallbackHelper); 97 DISALLOW_COPY_AND_ASSIGN(CallbackHelper);
98 }; 98 };
99 99
100 PipelineImplTest() 100 PipelineImplTest()
101 : pipeline_( 101 : pipeline_(new PipelineImpl(message_loop_.task_runner(), &media_log_)),
102 new PipelineImpl(message_loop_.task_runner(), new MediaLog())),
103 demuxer_(new StrictMock<MockDemuxer>()), 102 demuxer_(new StrictMock<MockDemuxer>()),
104 demuxer_host_(nullptr), 103 demuxer_host_(nullptr),
105 scoped_renderer_(new StrictMock<MockRenderer>()), 104 scoped_renderer_(new StrictMock<MockRenderer>()),
106 renderer_(scoped_renderer_.get()), 105 renderer_(scoped_renderer_.get()),
107 renderer_client_(nullptr) { 106 renderer_client_(nullptr) {
108 // SetDemuxerExpectations() adds overriding expectations for expected 107 // SetDemuxerExpectations() adds overriding expectations for expected
109 // non-NULL streams. 108 // non-NULL streams.
110 std::vector<DemuxerStream*> empty; 109 std::vector<DemuxerStream*> empty;
111 EXPECT_CALL(*demuxer_, GetAllStreams()).WillRepeatedly(Return(empty)); 110 EXPECT_CALL(*demuxer_, GetAllStreams()).WillRepeatedly(Return(empty));
112 111
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 EXPECT_FALSE(pipeline_->DidLoadingProgress()); 316 EXPECT_FALSE(pipeline_->DidLoadingProgress());
318 EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size()); 317 EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
319 EXPECT_EQ(base::TimeDelta(), pipeline_->GetBufferedTimeRanges().start(0)); 318 EXPECT_EQ(base::TimeDelta(), pipeline_->GetBufferedTimeRanges().start(0));
320 EXPECT_EQ(duration, pipeline_->GetBufferedTimeRanges().end(0)); 319 EXPECT_EQ(duration, pipeline_->GetBufferedTimeRanges().end(0));
321 } 320 }
322 321
323 // Fixture members. 322 // Fixture members.
324 StrictMock<CallbackHelper> callbacks_; 323 StrictMock<CallbackHelper> callbacks_;
325 base::SimpleTestTickClock test_tick_clock_; 324 base::SimpleTestTickClock test_tick_clock_;
326 base::MessageLoop message_loop_; 325 base::MessageLoop message_loop_;
326 MediaLog media_log_;
327 std::unique_ptr<PipelineImpl> pipeline_; 327 std::unique_ptr<PipelineImpl> pipeline_;
328 328
329 std::unique_ptr<StrictMock<MockDemuxer>> demuxer_; 329 std::unique_ptr<StrictMock<MockDemuxer>> demuxer_;
330 DemuxerHost* demuxer_host_; 330 DemuxerHost* demuxer_host_;
331 std::unique_ptr<StrictMock<MockRenderer>> scoped_renderer_; 331 std::unique_ptr<StrictMock<MockRenderer>> scoped_renderer_;
332 StrictMock<MockRenderer>* renderer_; 332 StrictMock<MockRenderer>* renderer_;
333 StrictMock<CallbackHelper> text_renderer_callbacks_; 333 StrictMock<CallbackHelper> text_renderer_callbacks_;
334 TextRenderer* text_renderer_; 334 TextRenderer* text_renderer_;
335 std::unique_ptr<StrictMock<MockDemuxerStream>> audio_stream_; 335 std::unique_ptr<StrictMock<MockDemuxerStream>> audio_stream_;
336 std::unique_ptr<StrictMock<MockDemuxerStream>> video_stream_; 336 std::unique_ptr<StrictMock<MockDemuxerStream>> video_stream_;
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 INSTANTIATE_TEARDOWN_TEST(Error, Seeking); 1126 INSTANTIATE_TEARDOWN_TEST(Error, Seeking);
1127 INSTANTIATE_TEARDOWN_TEST(Error, Playing); 1127 INSTANTIATE_TEARDOWN_TEST(Error, Playing);
1128 INSTANTIATE_TEARDOWN_TEST(Error, Suspending); 1128 INSTANTIATE_TEARDOWN_TEST(Error, Suspending);
1129 INSTANTIATE_TEARDOWN_TEST(Error, Suspended); 1129 INSTANTIATE_TEARDOWN_TEST(Error, Suspended);
1130 INSTANTIATE_TEARDOWN_TEST(Error, Resuming); 1130 INSTANTIATE_TEARDOWN_TEST(Error, Resuming);
1131 1131
1132 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Playing); 1132 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Playing);
1133 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Suspended); 1133 INSTANTIATE_TEARDOWN_TEST(ErrorAndStop, Suspended);
1134 1134
1135 } // namespace media 1135 } // namespace media
OLDNEW
« no previous file with comments | « media/base/pipeline_impl.cc ('k') | media/base/stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698