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

Side by Side Diff: chromecast/media/cma/base/demuxer_stream_adapter_unittest.cc

Issue 2311363002: Remove calls to deprecated MessageLoop methods in chromecast. (Closed)
Patch Set: self-review Created 4 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromecast/media/cma/base/demuxer_stream_adapter.h" 5 #include "chromecast/media/cma/base/demuxer_stream_adapter.h"
6 6
7 #include <list> 7 #include <list>
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/run_loop.h"
14 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
15 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
16 #include "base/threading/thread_task_runner_handle.h" 17 #include "base/threading/thread_task_runner_handle.h"
17 #include "base/time/time.h" 18 #include "base/time/time.h"
18 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h" 19 #include "chromecast/media/cma/base/balanced_media_task_runner_factory.h"
19 #include "chromecast/media/cma/base/decoder_buffer_base.h" 20 #include "chromecast/media/cma/base/decoder_buffer_base.h"
20 #include "chromecast/media/cma/base/demuxer_stream_for_test.h" 21 #include "chromecast/media/cma/base/demuxer_stream_for_test.h"
21 #include "chromecast/public/media/cast_decoder_buffer.h" 22 #include "chromecast/public/media/cast_decoder_buffer.h"
22 #include "media/base/audio_decoder_config.h" 23 #include "media/base/audio_decoder_config.h"
23 #include "media/base/decoder_buffer.h" 24 #include "media/base/decoder_buffer.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 config_idx_.push_back(0); 156 config_idx_.push_back(0);
156 config_idx_.push_back(5); 157 config_idx_.push_back(5);
157 158
158 int cycle_count = 1; 159 int cycle_count = 1;
159 int delayed_frame_count = 0; 160 int delayed_frame_count = 0;
160 demuxer_stream_.reset(new DemuxerStreamForTest( 161 demuxer_stream_.reset(new DemuxerStreamForTest(
161 -1, cycle_count, delayed_frame_count, config_idx_)); 162 -1, cycle_count, delayed_frame_count, config_idx_));
162 163
163 std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop()); 164 std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
164 Initialize(demuxer_stream_.get()); 165 Initialize(demuxer_stream_.get());
165 message_loop->PostTask( 166 message_loop->task_runner()->PostTask(
166 FROM_HERE, 167 FROM_HERE,
167 base::Bind(&DemuxerStreamAdapterTest::Start, base::Unretained(this))); 168 base::Bind(&DemuxerStreamAdapterTest::Start, base::Unretained(this)));
168 message_loop->Run(); 169 base::RunLoop().Run();
169 } 170 }
170 171
171 TEST_F(DemuxerStreamAdapterTest, AllDelayed) { 172 TEST_F(DemuxerStreamAdapterTest, AllDelayed) {
172 total_frames_ = 10; 173 total_frames_ = 10;
173 early_flush_idx_ = total_frames_; // No early flush. 174 early_flush_idx_ = total_frames_; // No early flush.
174 total_expected_frames_ = 10; 175 total_expected_frames_ = 10;
175 config_idx_.push_back(0); 176 config_idx_.push_back(0);
176 config_idx_.push_back(5); 177 config_idx_.push_back(5);
177 178
178 int cycle_count = 1; 179 int cycle_count = 1;
179 int delayed_frame_count = 1; 180 int delayed_frame_count = 1;
180 demuxer_stream_.reset(new DemuxerStreamForTest( 181 demuxer_stream_.reset(new DemuxerStreamForTest(
181 -1, cycle_count, delayed_frame_count, config_idx_)); 182 -1, cycle_count, delayed_frame_count, config_idx_));
182 183
183 std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop()); 184 std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
184 Initialize(demuxer_stream_.get()); 185 Initialize(demuxer_stream_.get());
185 message_loop->PostTask( 186 message_loop->task_runner()->PostTask(
186 FROM_HERE, 187 FROM_HERE,
187 base::Bind(&DemuxerStreamAdapterTest::Start, base::Unretained(this))); 188 base::Bind(&DemuxerStreamAdapterTest::Start, base::Unretained(this)));
188 message_loop->Run(); 189 base::RunLoop().Run();
189 } 190 }
190 191
191 TEST_F(DemuxerStreamAdapterTest, AllDelayedEarlyFlush) { 192 TEST_F(DemuxerStreamAdapterTest, AllDelayedEarlyFlush) {
192 total_frames_ = 10; 193 total_frames_ = 10;
193 early_flush_idx_ = 5; 194 early_flush_idx_ = 5;
194 use_post_task_for_flush_ = true; 195 use_post_task_for_flush_ = true;
195 total_expected_frames_ = 5; 196 total_expected_frames_ = 5;
196 config_idx_.push_back(0); 197 config_idx_.push_back(0);
197 config_idx_.push_back(3); 198 config_idx_.push_back(3);
198 199
199 int cycle_count = 1; 200 int cycle_count = 1;
200 int delayed_frame_count = 1; 201 int delayed_frame_count = 1;
201 demuxer_stream_.reset(new DemuxerStreamForTest( 202 demuxer_stream_.reset(new DemuxerStreamForTest(
202 -1, cycle_count, delayed_frame_count, config_idx_)); 203 -1, cycle_count, delayed_frame_count, config_idx_));
203 204
204 std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop()); 205 std::unique_ptr<base::MessageLoop> message_loop(new base::MessageLoop());
205 Initialize(demuxer_stream_.get()); 206 Initialize(demuxer_stream_.get());
206 message_loop->PostTask( 207 message_loop->task_runner()->PostTask(
207 FROM_HERE, 208 FROM_HERE,
208 base::Bind(&DemuxerStreamAdapterTest::Start, base::Unretained(this))); 209 base::Bind(&DemuxerStreamAdapterTest::Start, base::Unretained(this)));
209 message_loop->Run(); 210 base::RunLoop().Run();
210 } 211 }
211 212
212 } // namespace media 213 } // namespace media
213 } // namespace chromecast 214 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698