media: Use new wrapper types for media mojo interfaces

media/mojo/clients/mojo_cdm.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_CLIENTS_MOJO_CDM_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_CDM_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_initialized_promise.h"
 #include "media/base/media_keys.h"
-#include "media/mojo/common/mojo_type_trait.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class MojoDecryptor;
@@ skipping 51 matching lines @@
   ~MojoCdm() final;
 
   void InitializeCdm(const std::string& key_system,
                      const GURL& security_origin,
                      const media::CdmConfig& cdm_config,
                      std::unique_ptr<CdmInitializedPromise> promise);
 
   void OnConnectionError();
 
   // mojom::ContentDecryptionModuleClient implementation.
-  void OnSessionMessage(const mojo::String& session_id,
+  void OnSessionMessage(const std::string& session_id,
                         mojom::CdmMessageType message_type,
-                        mojo::Array<uint8_t> message) final;
-  void OnSessionClosed(const mojo::String& session_id) final;
+                        const std::vector<uint8_t>& message) final;
+  void OnSessionClosed(const std::string& session_id) final;
   void OnSessionKeysChange(
-      const mojo::String& session_id,
+      const std::string& session_id,
       bool has_additional_usable_key,
-      mojo::Array<mojom::CdmKeyInformationPtr> keys_info) final;
-  void OnSessionExpirationUpdate(const mojo::String& session_id,
+      std::vector<mojom::CdmKeyInformationPtr> keys_info) final;

[jrummell, 2016/10/11 22:25:21]

const & ?

+  void OnSessionExpirationUpdate(const std::string& session_id,
                                  double new_expiry_time_sec) final;
 
   // Callback for InitializeCdm.
-  // Note: Cannot use OnPromiseResult() below since we need to handle connection
-  // error. Also we have extra parameters |cdm_id| and |decryptor|, which aren't
-  // needed in CdmInitializedPromise.
   void OnCdmInitialized(mojom::CdmPromiseResultPtr result,
                         int cdm_id,
                         mojom::DecryptorPtr decryptor);
 
   // Callback when new decryption key is available.
   void OnKeyAdded();
 
   // Callbacks to handle CDM promises.
-  // We have to inline this method, since MS VS 2013 compiler fails to compile
-  // it when this method is not inlined. It fails with error C2244
-  // "unable to match function definition to an existing declaration".
-  template <typename... T>
-  void OnPromiseResult(std::unique_ptr<CdmPromiseTemplate<T...>> promise,
-                       mojom::CdmPromiseResultPtr result,
-                       typename MojoTypeTrait<T>::MojoType... args) {
-    if (result->success)
-      promise->resolve(args.template To<T>()...);  // See ISO C++03 14.2/4.
-    else
-      RejectPromise(std::move(promise), std::move(result));
-  }
+  void OnSimpleCdmPromiseResult(std::unique_ptr<SimpleCdmPromise> promise,
+                                mojom::CdmPromiseResultPtr result);
+  void OnNewSessionCdmPromiseResult(
+      std::unique_ptr<NewSessionCdmPromise> promise,
+      mojom::CdmPromiseResultPtr result,
+      const std::string& session_id);
 
   base::ThreadChecker thread_checker_;
 
   mojom::ContentDecryptionModulePtr remote_cdm_;
   mojo::Binding<ContentDecryptionModuleClient> binding_;
 
   // Protects |cdm_id_|, |decryptor_ptr_|, |decryptor_| and
   // |decryptor_task_runner_| which could be accessed from other threads.
   // See CdmContext implementation above.
   mutable base::Lock lock_;
@@ skipping 24 matching lines @@
 
   // This must be the last member.
   base::WeakPtrFactory<MojoCdm> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_CDM_H_