OLD | NEW |
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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "media/base/audio_decoder_config.h" | 8 #include "media/base/audio_decoder_config.h" |
9 #include "media/base/channel_layout.h" | 9 #include "media/base/channel_layout.h" |
10 #include "media/base/demuxer_stream_provider.h" | 10 #include "media/base/demuxer_stream_provider.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 // ApplicationTestBase implementation. | 107 // ApplicationTestBase implementation. |
108 mojo::ApplicationDelegate* GetApplicationDelegate() override { | 108 mojo::ApplicationDelegate* GetApplicationDelegate() override { |
109 return &mojo_renderer_test_helper_; | 109 return &mojo_renderer_test_helper_; |
110 } | 110 } |
111 | 111 |
112 void SetUp() override { | 112 void SetUp() override { |
113 ApplicationTestBase::SetUp(); | 113 ApplicationTestBase::SetUp(); |
114 demuxer_stream_provider_.reset(new FakeDemuxerStream()); | 114 demuxer_stream_provider_.reset(new FakeDemuxerStream()); |
115 service_provider_ = | 115 service_provider_ = |
116 application_impl() | 116 application_impl() |
117 ->ConnectToApplication("mojo:mojo_media_renderer_app") | 117 ->ConnectToApplication("mojo:media") |
118 ->GetServiceProvider(); | 118 ->GetServiceProvider(); |
119 } | 119 } |
120 | 120 |
121 mojo::ServiceProvider* service_provider() { return service_provider_; } | 121 mojo::ServiceProvider* service_provider() { return service_provider_; } |
122 DemuxerStreamProvider* stream_provider() { | 122 DemuxerStreamProvider* stream_provider() { |
123 return demuxer_stream_provider_.get(); | 123 return demuxer_stream_provider_.get(); |
124 } | 124 } |
125 scoped_refptr<base::SingleThreadTaskRunner> task_runner() { | 125 scoped_refptr<base::SingleThreadTaskRunner> task_runner() { |
126 return base::MessageLoop::current()->task_runner(); | 126 return base::MessageLoop::current()->task_runner(); |
127 } | 127 } |
(...skipping 23 matching lines...) Expand all Loading... |
151 media::Renderer::PaintCB(), base::Closure(), | 151 media::Renderer::PaintCB(), base::Closure(), |
152 base::Bind(&ErrorCallback, &expected_error)); | 152 base::Bind(&ErrorCallback, &expected_error)); |
153 base::MessageLoop::current()->Run(); | 153 base::MessageLoop::current()->Run(); |
154 | 154 |
155 // We expect an error during initialization because MojoRendererService | 155 // We expect an error during initialization because MojoRendererService |
156 // doesn't initialize any decoders, which causes an error. | 156 // doesn't initialize any decoders, which causes an error. |
157 EXPECT_EQ(PIPELINE_ERROR_COULD_NOT_RENDER, expected_error); | 157 EXPECT_EQ(PIPELINE_ERROR_COULD_NOT_RENDER, expected_error); |
158 } | 158 } |
159 | 159 |
160 } // namespace media | 160 } // namespace media |
OLD | NEW |