media: Add ServiceFactory mojo interface and implementation.

media/mojo/services/mojo_media_application.h

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 955f6760f645e30a84b0fad6f80d393e22ec3434..e932b5dd7c304911211ee0985c16f3beadf0ca5c 100644
--- a/media/mojo/services/mojo_media_application.h
+++ b/media/mojo/services/mojo_media_application.h
@@ -2,24 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/memory/scoped_ptr.h"
-#include "media/mojo/interfaces/content_decryption_module.mojom.h"
-#include "media/mojo/interfaces/media_renderer.mojom.h"
-#include "media/mojo/services/mojo_cdm_service_context.h"
+#include "base/memory/ref_counted.h"
+#include "media/mojo/interfaces/service_factory.mojom.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 CdmFactory;
 class MediaLog;
-class RendererFactory;
 
 class MojoMediaApplication
     : public mojo::ApplicationDelegate,
-      public mojo::InterfaceFactory<interfaces::ContentDecryptionModule>,
-      public mojo::InterfaceFactory<interfaces::MediaRenderer> {
+      public mojo::InterfaceFactory<interfaces::ServiceFactory> {
  public:
   static GURL AppUrl();
   static scoped_ptr<mojo::ApplicationDelegate> CreateApp();
@@ -33,21 +28,10 @@ class MojoMediaApplication
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) final;
 
-  // mojo::InterfaceFactory<interfaces::ContentDecryptionModule> implementation.
+  // mojo::InterfaceFactory<interfaces::ServiceFactory> implementation.
   void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<interfaces::ContentDecryptionModule>
-                  request) final;
+              mojo::InterfaceRequest<interfaces::ServiceFactory> request) final;
 
-  // mojo::InterfaceFactory<interfaces::MediaRenderer> implementation.
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<interfaces::MediaRenderer> request) final;
-
-  RendererFactory* GetRendererFactory();
-  CdmFactory* GetCdmFactory();
-
-  MojoCdmServiceContext cdm_service_context_;
-  scoped_ptr<RendererFactory> renderer_factory_;
-  scoped_ptr<CdmFactory> cdm_factory_;
   scoped_refptr<MediaLog> media_log_;
 };