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

Unified Diff: media/mojo/services/media_renderer_apptest.cc

Issue 785643002: Pass mojo::MediaRendererPtr in MojoRendererImpl's constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_app
Patch Set: Created 6 years 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
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 afa4ef990e49c03a6fc272c8773da83dc8e2b6d5..08cd26f5a44362fb04c0ba420b9c003af07d197b 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 {
@@ -118,7 +119,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();
}
@@ -143,7 +150,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(),
« no previous file with comments | « no previous file | media/mojo/services/mojo_renderer_impl.h » ('j') | mojo/services/html_viewer/webmediaplayer_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698