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

Unified Diff: media/filters/pipeline_integration_test_base.cc

Issue 10855051: Use enum instead of string in MessageLoopFactory::GetMessageLoop* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/filters/video_frame_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 3e01b572c6604dbc949911ba885a9883e01f2fec..76152eda8783133c202bc85e00fd436ebc1cea09 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -22,7 +22,8 @@ const char kNullHash[] = "d41d8cd98f00b204e9800998ecf8427e";
PipelineIntegrationTestBase::PipelineIntegrationTestBase()
: hashing_enabled_(false),
message_loop_factory_(new MessageLoopFactory()),
- pipeline_(new Pipeline(&message_loop_, new MediaLog())),
+ pipeline_(new Pipeline(message_loop_.message_loop_proxy(),
+ new MediaLog())),
ended_(false),
pipeline_status_(PIPELINE_OK) {
base::MD5Init(&md5_context_);
@@ -171,8 +172,9 @@ scoped_ptr<FilterCollection>
PipelineIntegrationTestBase::CreateFilterCollection(const std::string& url) {
scoped_refptr<FileDataSource> data_source = new FileDataSource();
CHECK(data_source->Initialize(url));
- return CreateFilterCollection(new FFmpegDemuxer(&message_loop_, data_source),
- NULL);
+ return CreateFilterCollection(
+ new FFmpegDemuxer(message_loop_.message_loop_proxy(), data_source),
+ NULL);
}
scoped_ptr<FilterCollection>
@@ -191,11 +193,11 @@ PipelineIntegrationTestBase::CreateFilterCollection(
collection->AddAudioDecoder(new FFmpegAudioDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
- "AudioDecoderThread")));
+ media::MessageLoopFactory::kAudioDecoder)));
scoped_refptr<VideoDecoder> decoder = new FFmpegVideoDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
- "VideoDecoderThread"),
+ media::MessageLoopFactory::kVideoDecoder),
decryptor);
collection->GetVideoDecoders()->push_back(decoder);
« no previous file with comments | « media/filters/gpu_video_decoder.cc ('k') | media/filters/video_frame_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698