Chromium Code Reviews| 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..26f760246e8784a51654d8bd878094eb00d81c33 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...)> |
| + typedef base::Callback<void(mojom::CdmPromiseResultPtr, const T&...)> |
|
dcheng
2016/10/11 23:53:34
Nit: since we're changing this anyway, let's use u
xhwang
2016/10/12 00:00:38
Done.
|
| CallbackType; |
| - MojoCdmPromise(const CallbackType& callback); |
| + explicit MojoCdmPromise(const CallbackType& callback); |
| ~MojoCdmPromise() final; |
| // CdmPromiseTemplate<> implementation. |