Update ClearKey to support CDM_6

media/base/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/base/cdm_promise.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 
 namespace media {
@@ skipping 20 matching lines @@
 
 template <typename T>
 CdmPromiseTemplate<T>::CdmPromiseTemplate(
     base::Callback<void(const T&)> resolve_cb,
     PromiseRejectedCB reject_cb)
     : CdmPromise(reject_cb), resolve_cb_(resolve_cb) {
   DCHECK(!resolve_cb_.is_null());
 }
 
 template <typename T>
+CdmPromiseTemplate<T>::CdmPromiseTemplate() {
+}
+
+template <typename T>
 CdmPromiseTemplate<T>::~CdmPromiseTemplate() {
   DCHECK(!is_pending_);
 }
 
 template <typename T>
 void CdmPromiseTemplate<T>::resolve(const T& result) {
   DCHECK(is_pending_);
   is_pending_ = false;
   resolve_cb_.Run(result);
 }
@@ skipping 12 matching lines @@
 }
 
 void CdmPromiseTemplate<void>::resolve() {
   DCHECK(is_pending_);
   is_pending_ = false;
   resolve_cb_.Run();
 }
 
 // Explicit template instantiation for the Promises needed.
 template class MEDIA_EXPORT CdmPromiseTemplate<std::string>;
+template class MEDIA_EXPORT CdmPromiseTemplate<KeyIdsVector>;
 
 }  // namespace media