media: Run mojo media application in GPU process on desktop by default

media/mojo/services/service_factory_impl.cc

 // 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.
 
 #include "media/mojo/services/service_factory_impl.h"
 
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/media_log.h"
 #include "media/mojo/services/mojo_media_client.h"
@@ skipping 22 matching lines @@
 ServiceFactoryImpl::ServiceFactoryImpl(
     mojo::InterfaceRequest<mojom::ServiceFactory> request,
     shell::mojom::InterfaceProvider* interfaces,
     scoped_refptr<MediaLog> media_log,
     std::unique_ptr<shell::ShellConnectionRef> connection_ref,
     MojoMediaClient* mojo_media_client)
     : binding_(this, std::move(request)),
 #if defined(ENABLE_MOJO_CDM)
       interfaces_(interfaces),
 #endif
-#if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_CDM) || \
-    defined(ENABLE_MOJO_RENDERER)
-      mojo_media_client_(mojo_media_client),
-#endif
       media_log_(media_log),
-      connection_ref_(std::move(connection_ref)) {
+      connection_ref_(std::move(connection_ref)),
+      mojo_media_client_(mojo_media_client) {
   DVLOG(1) << __FUNCTION__;
+  DCHECK(mojo_media_client_);
 }
 
 ServiceFactoryImpl::~ServiceFactoryImpl() {
   DVLOG(1) << __FUNCTION__;
 }
 
 // mojom::ServiceFactory implementation.
 
 void ServiceFactoryImpl::CreateAudioDecoder(
     mojo::InterfaceRequest<mojom::AudioDecoder> request) {
@@ skipping 76 matching lines @@
 CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
   if (!cdm_factory_) {
     cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_);
     LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available.";
   }
   return cdm_factory_.get();
 }
 #endif  // defined(ENABLE_MOJO_CDM)
 
 }  // namespace media