media: Use new wrapper types for media mojo interfaces

media/mojo/services/mojo_cdm_promise.h

Index: media/mojo/services/mojo_cdm_promise.h
diff --git a/media/mojo/services/mojo_cdm_promise.h b/media/mojo/services/mojo_cdm_promise.h
index 0d82b2b9cea573ca22feca82d374e9fecef5b7f2..b7c16c0446fd631f197c0d3010fe519b1c13eeea 100644
--- a/media/mojo/services/mojo_cdm_promise.h
+++ b/media/mojo/services/mojo_cdm_promise.h
@@ -10,7 +10,6 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "media/base/cdm_promise.h"
-#include "media/mojo/common/mojo_type_trait.h"
 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
 
 namespace media {
@@ -19,11 +18,10 @@ namespace media {
 template <typename... T>
 class MojoCdmPromise : public CdmPromiseTemplate<T...> {
  public:
-  typedef base::Callback<void(mojom::CdmPromiseResultPtr,
-                              typename MojoTypeTrait<T>::MojoType...)>
-      CallbackType;
+  using CallbackType =
+      base::Callback<void(mojom::CdmPromiseResultPtr, const T&...)>;
 
-  MojoCdmPromise(const CallbackType& callback);
+  explicit MojoCdmPromise(const CallbackType& callback);
   ~MojoCdmPromise() final;
 
   // CdmPromiseTemplate<> implementation.