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"
 #include "base/metrics/histogram.h"
 
@@ skipping 63 matching lines @@
 template <typename T>
 CdmPromiseTemplate<T>::CdmPromiseTemplate(
     base::Callback<void(const T&)> resolve_cb,
     PromiseRejectedCB reject_cb,
     const std::string& uma_name)
     : CdmPromise(reject_cb, uma_name), 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;
   if (!uma_name_.empty()) {
     base::LinearHistogram::FactoryGet(
@@ skipping 30 matching lines @@
   if (!uma_name_.empty()) {
     base::LinearHistogram::FactoryGet(
         uma_name_, 1, NUM_RESULT_CODES, NUM_RESULT_CODES + 1,
         base::HistogramBase::kUmaTargetedHistogramFlag)->Add(SUCCESS);
   }
   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