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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 1230313010: media: Add ServiceFactory mojo interface and implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 5 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/mojo/services/service_factory_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 47bead6c611ce7ffdc61e114f4cfe2fdb50e818f..feecbe6bbf762f3864e88e4b2829688dd2cf4842 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -26,6 +26,8 @@
#include "url/gurl.h"
#if defined(MOJO_RENDERER)
+#include "media/mojo/interfaces/media_renderer.mojom.h"
+#include "media/mojo/interfaces/service_factory.mojom.h"
#include "media/mojo/services/mojo_renderer_impl.h"
#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/application/public/cpp/application_test_base.h"
@@ -619,11 +621,18 @@ class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase,
->ConnectToApplication(request.Pass())
->GetServiceProvider();
+ mojo::ConnectToService(service_provider, &media_service_factory_);
+
interfaces::MediaRendererPtr mojo_media_renderer;
- mojo::ConnectToService(service_provider, &mojo_media_renderer);
+ media_service_factory_->CreateRenderer(
+ mojo::GetProxy(&mojo_media_renderer));
+
return make_scoped_ptr(new MojoRendererImpl(message_loop_.task_runner(),
mojo_media_renderer.Pass()));
}
+
+ private:
+ interfaces::ServiceFactoryPtr media_service_factory_;
};
#else
class PipelineIntegrationTestHost : public testing::Test,
« no previous file with comments | « media/mojo/services/service_factory_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698