media: Use new wrapper types for media mojo interfaces

media/mojo/services/mojo_cdm_promise.cc

 // 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.
 
 #include "media/mojo/services/mojo_cdm_promise.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 29 matching lines @@
 
   DCHECK(!callback_.is_null());
   RejectPromiseOnDestruction();
 }
 
 template <typename... T>
 void MojoCdmPromise<T...>::resolve(const T&... result) {
   MarkPromiseSettled();
   mojom::CdmPromiseResultPtr cdm_promise_result(mojom::CdmPromiseResult::New());
   cdm_promise_result->success = true;
-  callback_.Run(
-      std::move(cdm_promise_result),
-      mojo::TypeConverter<typename MojoTypeTrait<T>::MojoType, T>::Convert(
-          result)...);
+  callback_.Run(std::move(cdm_promise_result), result...);
   callback_.Reset();
 }
 
 template <typename... T>
 void MojoCdmPromise<T...>::reject(MediaKeys::Exception exception,
                                   uint32_t system_code,
                                   const std::string& error_message) {
   MarkPromiseSettled();
-  callback_.Run(GetRejectResult(exception, system_code, error_message),
-                MojoTypeTrait<T>::DefaultValue()...);
+  callback_.Run(GetRejectResult(exception, system_code, error_message), T()...);
   callback_.Reset();
 }
 
 template class MojoCdmPromise<>;
 template class MojoCdmPromise<std::string>;
 
 }  // namespace media