Index: media/mojo/services/mojo_media_application.cc |
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc |
index 41e2feeb0d381b08c28c58237b2e898ccb5c88de..4747e40a102840ab92a7786ae91d433750a530c5 100644 |
--- a/media/mojo/services/mojo_media_application.cc |
+++ b/media/mojo/services/mojo_media_application.cc |
@@ -7,9 +7,7 @@ |
#include "base/logging.h" |
#include "media/base/media_log.h" |
#include "media/mojo/services/mojo_media_client.h" |
-#include "media/mojo/services/service_factory_impl.h" |
#include "mojo/application/public/cpp/application_connection.h" |
-#include "mojo/application/public/cpp/application_impl.h" |
namespace media { |
@@ -27,16 +25,13 @@ MojoMediaApplication::MojoMediaApplication( |
bool enable_logging, |
scoped_ptr<MojoMediaClient> mojo_media_client) |
: enable_logging_(enable_logging), |
- mojo_media_client_(std::move(mojo_media_client)), |
- app_impl_(nullptr), |
- media_log_(new MediaLog()) {} |
+ media_log_(new MediaLog()), |
+ service_factory_(std::move(mojo_media_client), media_log_) {} |
MojoMediaApplication::~MojoMediaApplication() { |
} |
void MojoMediaApplication::Initialize(mojo::ApplicationImpl* app) { |
- app_impl_ = app; |
- |
if (enable_logging_) { |
logging::LoggingSettings settings; |
settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
@@ -44,23 +39,15 @@ void MojoMediaApplication::Initialize(mojo::ApplicationImpl* app) { |
// Display process ID, thread ID and timestamp in logs. |
logging::SetLogItems(true, true, true, false); |
} |
- mojo_media_client_->Initialize(); |
+ service_factory_.Initialize(app); |
} |
bool MojoMediaApplication::ConfigureIncomingConnection( |
mojo::ApplicationConnection* connection) { |
- connection->AddService<interfaces::ServiceFactory>(this); |
+ connection->AddService<interfaces::Renderer>(&service_factory_); |
+ connection->AddService<interfaces::ContentDecryptionModule>( |
+ &service_factory_); |
return true; |
} |
-void MojoMediaApplication::Create( |
- mojo::ApplicationConnection* connection, |
- mojo::InterfaceRequest<interfaces::ServiceFactory> request) { |
- // The created object is owned by the pipe. |
- new ServiceFactoryImpl(request.Pass(), connection->GetServiceProvider(), |
- media_log_, |
- app_impl_->app_lifetime_helper()->CreateAppRefCount(), |
- mojo_media_client_.get()); |
-} |
- |
} // namespace media |