media: Only provide necessary services in ServiceFactoryImpl

media/mojo/services/service_factory_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
@@ skipping 29 matching lines @@
 
   // interfaces::ServiceFactory implementation.
   void CreateAudioDecoder(
       mojo::InterfaceRequest<interfaces::AudioDecoder> audio_decoder) final;
   void CreateRenderer(
       mojo::InterfaceRequest<interfaces::Renderer> renderer) final;
   void CreateCdm(
       mojo::InterfaceRequest<interfaces::ContentDecryptionModule> cdm) final;
 
  private:
+#if defined(ENABLE_MOJO_RENDERER)
   RendererFactory* GetRendererFactory();
+
+  scoped_ptr<RendererFactory> renderer_factory_;
+#endif  // defined(ENABLE_MOJO_RENDERER)
+
+#if defined(ENABLE_MOJO_CDM)
   CdmFactory* GetCdmFactory();
 
+  scoped_ptr<CdmFactory> cdm_factory_;
+#endif  // defined(ENABLE_MOJO_CDM)
+
   MojoCdmServiceContext cdm_service_context_;

[xhwang, 2016/03/25 22:27:12]

In theory I can ifdef this as well, but it'll be more complicated. And we do
need it by default on Android. So maybe not worth the effort.

[DaleCurtis, 2016/03/25 22:29:13]

Shouldn't matter if it's used anyways then.

-
   mojo::StrongBinding<interfaces::ServiceFactory> binding_;
   mojo::shell::mojom::InterfaceProvider* interfaces_;
   scoped_refptr<MediaLog> media_log_;
   scoped_ptr<mojo::MessageLoopRef> parent_app_refcount_;
   MojoMediaClient* mojo_media_client_;
 
-  scoped_ptr<RendererFactory> renderer_factory_;
-  scoped_ptr<CdmFactory> cdm_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_