media: Support CdmFactory in MojoMediaClient.

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/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 "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
 
 namespace media {
 
+class CdmFactory;
 class MojoCdmServiceContext;
 
 // A mojo::ContentDecryptionModule implementation backed by a media::MediaKeys.
 class MojoCdmService : public mojo::ContentDecryptionModule {
  public:
   // Constructs a MojoCdmService and strongly binds it to the |request|.
   MojoCdmService(MojoCdmServiceContext* context,
+                 CdmFactory* cdm_factory,
                  mojo::InterfaceRequest<mojo::ContentDecryptionModule> request);
 
   ~MojoCdmService() final;
 
   // mojo::ContentDecryptionModule implementation.
   void SetClient(mojo::ContentDecryptionModuleClientPtr client) final;
   void Initialize(
       const mojo::String& key_system,
       const mojo::String& security_origin,
       int32_t cdm_id,
@@ skipping 20 matching lines @@
       const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) final;
   void RemoveSession(
       const mojo::String& session_id,
       const mojo::Callback<void(mojo::CdmPromiseResultPtr)>& callback) final;
   void GetDecryptor(mojo::InterfaceRequest<mojo::Decryptor> decryptor) final;
 
   // Get CdmContext to be used by the media pipeline.
   CdmContext* GetCdmContext();
 
  private:
+  // Callback for CdmFactory::Create().
+  void OnCdmCreated(int cdm_id,
+                    scoped_ptr<MojoCdmPromise<>> promise,
+                    scoped_ptr<MediaKeys> cdm,
+                    const std::string& error_message);

[ddorwin, 2015/07/09 18:13:04]

Why aren't these parameters part of the promise? It seems they apply to resolve
and reject, respectively.

[xhwang, 2015/07/09 21:16:31]

OnCdmCreated() needs to be bound into CdmCreatedCB. That's why we need the last
two parameters.

Actually as you can see, we bind
"mojo::Callback<void(mojo::CdmPromiseResultPtr)>&" into a SimpleMojoCdmPromise,
then bind SimpleMojoCdmPromise into a CdmCreatedCB. We could skip the
SimpleMojoCdmPromise step, but then we'll need to populate a CdmPromiseResultPtr
manually, similar to [1]. So this extra binding is really just for convenience.

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/media/mojo/service...

+
   // Callbacks for firing session events.
   void OnSessionMessage(const std::string& session_id,
                         MediaKeys::MessageType message_type,
                         const std::vector<uint8_t>& message,
                         const GURL& legacy_destination_url);
   void OnSessionKeysChange(const std::string& session_id,
                            bool has_additional_usable_key,
                            CdmKeysInfo keys_info);
   void OnSessionExpirationUpdate(const std::string& session_id,
                                  const base::Time& new_expiry_time);
   void OnSessionClosed(const std::string& session_id);
   void OnLegacySessionError(const std::string& session_id,
                             MediaKeys::Exception exception,
                             uint32_t system_code,
                             const std::string& error_message);
 
   mojo::StrongBinding<mojo::ContentDecryptionModule> binding_;
 
   MojoCdmServiceContext* context_;
+  CdmFactory* cdm_factory_;
+
   scoped_ptr<MediaKeys> cdm_;
 
   // Set to a valid CDM ID if the |cdm_| is successfully created.
   int cdm_id_;
 
   mojo::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_