Index: media/mojo/services/mojo_media_application.h |
diff --git a/media/mojo/services/mojo_media_application.h b/media/mojo/services/mojo_media_application.h |
index ccf86e1e3b33a6c51fa2960189852d7b864a111c..dab62cec722eb20d5e1fbc42768c6cfb32ecc580 100644 |
--- a/media/mojo/services/mojo_media_application.h |
+++ b/media/mojo/services/mojo_media_application.h |
@@ -3,19 +3,15 @@ |
// found in the LICENSE file. |
#include "base/memory/ref_counted.h" |
-#include "media/mojo/interfaces/service_factory.mojom.h" |
+#include "media/mojo/services/service_factory_impl.h" |
#include "mojo/application/public/cpp/application_delegate.h" |
-#include "mojo/application/public/cpp/interface_factory_impl.h" |
-#include "url/gurl.h" |
namespace media { |
class MediaLog; |
class MojoMediaClient; |
-class MojoMediaApplication |
- : public mojo::ApplicationDelegate, |
- public mojo::InterfaceFactory<interfaces::ServiceFactory> { |
+class MojoMediaApplication : public mojo::ApplicationDelegate { |
public: |
static scoped_ptr<mojo::ApplicationDelegate> CreateApp(); |
@@ -29,14 +25,9 @@ class MojoMediaApplication |
bool ConfigureIncomingConnection( |
mojo::ApplicationConnection* connection) final; |
- // mojo::InterfaceFactory<interfaces::ServiceFactory> implementation. |
- void Create(mojo::ApplicationConnection* connection, |
- mojo::InterfaceRequest<interfaces::ServiceFactory> request) final; |
- |
bool enable_logging_; |
- scoped_ptr<MojoMediaClient> mojo_media_client_; |
- mojo::ApplicationImpl* app_impl_; |
scoped_refptr<MediaLog> media_log_; |
+ ServiceFactoryImpl service_factory_; |
}; |
} // namespace media |