media: Use new wrapper types for media mojo interfaces

media/mojo/services/mojo_cdm_promise.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_PROMISE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_
 
 #include <stdint.h>
 
 #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 {
 
 // media::CdmPromiseTemplate implementations backed by base::Callbacks.
 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.
   void resolve(const T&... result) final;
   void reject(MediaKeys::Exception exception,
               uint32_t system_code,
               const std::string& error_message) final;
 
  private:
   using CdmPromiseTemplate<T...>::IsPromiseSettled;
   using CdmPromiseTemplate<T...>::MarkPromiseSettled;
   using CdmPromiseTemplate<T...>::RejectPromiseOnDestruction;
 
   CallbackType callback_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_CDM_PROMISE_H_