Delete media::Interfaces::ServiceFactory.

media/mojo/services/mojo_cdm_service.h

 // Copyright 2014 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_MOJO_CDM_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/media_keys.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "media/mojo/services/mojo_cdm_promise.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
 #include "media/mojo/services/mojo_decryptor_service.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace media {
 
 class CdmFactory;
 
 // A interfaces::ContentDecryptionModule implementation backed by a
 // media::MediaKeys.
 class MojoCdmService : public interfaces::ContentDecryptionModule {
  public:
   // Get the CDM associated with |cdm_id|, which is unique per process.
   // Can be called on any thread. The returned CDM is not guaranteed to be
   // thread safe.
   // Note: This provides a generic hack to get the CDM in the process where
   // MojoMediaApplication is running, regardless of which render process or
   // render frame the caller is associated with. In the future, we should move
   // all out-of-process media players into the MojoMediaApplicaiton so that we
   // can use MojoCdmServiceContext (per render frame) to get the CDM.
   static scoped_refptr<MediaKeys> GetCdm(int cdm_id);
 
   // Constructs a MojoCdmService and strongly binds it to the |request|.
-  MojoCdmService(
-      base::WeakPtr<MojoCdmServiceContext> context,
-      mojo::ServiceProvider* service_provider,
-      CdmFactory* cdm_factory,
-      mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request);
+  MojoCdmService(base::WeakPtr<MojoCdmServiceContext> context,
+                 CdmFactory* cdm_factory);
 
   ~MojoCdmService() final;
 
   // interfaces::ContentDecryptionModule implementation.
   void SetClient(interfaces::ContentDecryptionModuleClientPtr client) final;
   void Initialize(const mojo::String& key_system,
                   const mojo::String& security_origin,
                   interfaces::CdmConfigPtr cdm_config,
                   const InitializeCallback& callback) final;
   void SetServerCertificate(
@@ skipping 50 matching lines @@
                             const std::string& error_message);
 
   // Callback for when |decryptor_| loses connectivity.
   void OnDecryptorConnectionError();
 
   // CDM ID to be assigned to the next successfully initialized CDM. This ID is
   // unique per process. It will be used to locate the CDM by the media players
   // living in the same process.
   static int next_cdm_id_;
 
-  mojo::StrongBinding<interfaces::ContentDecryptionModule> binding_;
   base::WeakPtr<MojoCdmServiceContext> context_;
 
-  mojo::ServiceProvider* service_provider_;
   CdmFactory* cdm_factory_;
   scoped_refptr<MediaKeys> cdm_;
 
   scoped_ptr<MojoDecryptorService> decryptor_;
 
   // Set to a valid CDM ID if the |cdm_| is successfully created.
   int cdm_id_;
 
   interfaces::ContentDecryptionModuleClientPtr client_;
 
   base::WeakPtr<MojoCdmService> weak_this_;
   base::WeakPtrFactory<MojoCdmService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdmService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_H_