| Index: media/mojo/services/media_renderer_apptest.cc
|
| diff --git a/media/mojo/services/media_renderer_apptest.cc b/media/mojo/services/media_renderer_apptest.cc
|
| index 5dac6e4173264b459156c1f20b76e4d66fdc7ab1..cc4deeef40fbefe3a5d1945c694a330a48504289 100644
|
| --- a/media/mojo/services/media_renderer_apptest.cc
|
| +++ b/media/mojo/services/media_renderer_apptest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "mojo/public/cpp/application/application_delegate.h"
|
| #include "mojo/public/cpp/application/application_impl.h"
|
| #include "mojo/public/cpp/application/application_test_base.h"
|
| +#include "mojo/public/cpp/application/connect.h"
|
|
|
| namespace {
|
|
|
| @@ -117,7 +118,13 @@ class MojoRendererTest : public mojo::test::ApplicationTestBase {
|
| ->GetServiceProvider();
|
| }
|
|
|
| - mojo::ServiceProvider* service_provider() { return service_provider_; }
|
| + mojo::MediaRendererPtr CreateMediaRenderer() {
|
| + mojo::MediaRendererPtr mojo_media_renderer;
|
| + mojo::ConnectToService(service_provider_,
|
| + &mojo_media_renderer);
|
| + return mojo_media_renderer.Pass();
|
| + }
|
| +
|
| DemuxerStreamProvider* stream_provider() {
|
| return demuxer_stream_provider_.get();
|
| }
|
| @@ -142,7 +149,7 @@ void ErrorCallback(PipelineStatus* output, PipelineStatus status) {
|
| // connection. The test also initializes a media::AudioRendererImpl which
|
| // will error-out expectedly due to lack of support for decoder selection.
|
| TEST_F(MojoRendererTest, BasicInitialize) {
|
| - MojoRendererImpl mojo_renderer_impl(task_runner(), service_provider());
|
| + MojoRendererImpl mojo_renderer_impl(task_runner(), CreateMediaRenderer());
|
| PipelineStatus expected_error(PIPELINE_OK);
|
| mojo_renderer_impl.Initialize(
|
| stream_provider(), base::MessageLoop::current()->QuitClosure(),
|
|
|