| Index: media/mojo/services/mojo_cdm.cc
|
| diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
|
| index 69d2046e2a27edcb171e702dd1e06224f352e6c2..24d590543417d106f750eb1b8232e7ed2fec38e2 100644
|
| --- a/media/mojo/services/mojo_cdm.cc
|
| +++ b/media/mojo/services/mojo_cdm.cc
|
| @@ -169,14 +169,4 @@ void MojoCdm::OnSessionExpirationUpdate(const mojo::String& session_id,
|
| session_id, base::Time::FromInternalValue(new_expiry_time_usec));
|
| }
|
|
|
| -template <typename... T>
|
| -void MojoCdm::OnPromiseResult(scoped_ptr<CdmPromiseTemplate<T...>> promise,
|
| - mojo::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(promise.Pass(), result.Pass());
|
| -}
|
| -
|
| } // namespace media
|
|
|