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