Refactor CdmPromise and related classes

content/renderer/media/webcontentdecryptionmodule_impl.cc

 // Copyright 2013 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 "content/renderer/media/webcontentdecryptionmodule_impl.h"
 
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 90 matching lines @@
 }
 
 void WebContentDecryptionModuleImpl::setServerCertificate(
     const uint8* server_certificate,
     size_t server_certificate_length,
     blink::WebContentDecryptionModuleResult result) {
   DCHECK(server_certificate);
   adapter_->SetServerCertificate(
       server_certificate,
       server_certificate_length,
-      scoped_ptr<media::SimpleCdmPromise>(new SimpleCdmResultPromise(result)));
+      scoped_ptr<media::SimpleCdmPromise>(
+          new CdmResultPromise<>(result, std::string())));
 }
 
 media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() {
   return adapter_->GetDecryptor();
 }
 
 #if defined(ENABLE_BROWSER_CDMS)
 int WebContentDecryptionModuleImpl::GetCdmId() const {
   return adapter_->GetCdmId();
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content