Refactor CdmPromise and related classes

content/renderer/media/webcontentdecryptionmodulesession_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/webcontentdecryptionmodulesession_impl.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 12 matching lines @@
 
 class NewSessionCdmResultPromise : public CdmResultPromise<std::string> {
  public:
   NewSessionCdmResultPromise(blink::WebContentDecryptionModuleResult result,
                              std::string uma_name,
                              const SessionInitializedCB& new_session_created_cb)
       : CdmResultPromise<std::string>(result, uma_name),
         new_session_created_cb_(new_session_created_cb) {}
 
  protected:
-  virtual void OnResolve(const std::string& web_session_id) OVERRIDE {
+  virtual void resolve(const std::string& web_session_id) OVERRIDE {
+    CdmResultPromise<std::string>::resolve(web_session_id);
     blink::WebContentDecryptionModuleResult::SessionStatus status =
         new_session_created_cb_.Run(web_session_id);
     web_cdm_result_.completeWithSession(status);

[xhwang, 2014/10/03 07:34:21]

Hmm, this is more confusing than I thought. Is this going away? If so, add a
TODO to remove it...

[jrummell, 2014/10/03 18:58:30]

This won't be going away, even if we pass |web_session_id| to blink. Registering
the session with cdm_adapter is still needed.

[xhwang, 2014/10/03 19:25:16]

I see. This is a bit hacky. Imagine what if we have another type of promise that
really takes a string and calls something like 
completeWithString() in blink::WebContentDecryptionModuleResult.

Maybe inherit from CdmPromiseTemplate<std::string> directly would be cleaner in
that case.

For now feel free to add a TODO so that we don't forget about this.

[jrummell, 2014/10/03 21:41:05]

Moved to cdm_result_promise as a specialization.

   }
 
  private:
   SessionInitializedCB new_session_created_cb_;
 };
 
 WebContentDecryptionModuleSessionImpl::WebContentDecryptionModuleSessionImpl(
     const scoped_refptr<CdmSessionAdapter>& adapter)
     : adapter_(adapter),
       is_closed_(false),
@@ skipping 75 matching lines @@
 void WebContentDecryptionModuleSessionImpl::update(
     const uint8* response,
     size_t response_length,
     blink::WebContentDecryptionModuleResult result) {
   DCHECK(response);
   DCHECK(!web_session_id_.empty());
   adapter_->UpdateSession(
       web_session_id_,
       response,
       response_length,
-      scoped_ptr<media::SimpleCdmPromise>(new SimpleCdmResultPromise(result)));
+      scoped_ptr<media::SimpleCdmPromise>(
+          new SimpleCdmResultPromise(result, std::string())));
 }
 
 void WebContentDecryptionModuleSessionImpl::close(
     blink::WebContentDecryptionModuleResult result) {
   DCHECK(!web_session_id_.empty());
   adapter_->CloseSession(
       web_session_id_,
-      scoped_ptr<media::SimpleCdmPromise>(new SimpleCdmResultPromise(result)));
+      scoped_ptr<media::SimpleCdmPromise>(
+          new SimpleCdmResultPromise(result, std::string())));
 }
 
 void WebContentDecryptionModuleSessionImpl::remove(
     blink::WebContentDecryptionModuleResult result) {
   DCHECK(!web_session_id_.empty());
   adapter_->RemoveSession(
       web_session_id_,
-      scoped_ptr<media::SimpleCdmPromise>(new SimpleCdmResultPromise(result)));
+      scoped_ptr<media::SimpleCdmPromise>(
+          new SimpleCdmResultPromise(result, std::string())));
 }
 
 void WebContentDecryptionModuleSessionImpl::getUsableKeyIds(
     blink::WebContentDecryptionModuleResult result) {
   DCHECK(!web_session_id_.empty());
   adapter_->GetUsableKeyIds(
       web_session_id_,
       scoped_ptr<media::KeyIdsPromise>(
-          new CdmResultPromise<media::KeyIdsVector>(result)));
+          new CdmResultPromise<media::KeyIdsVector>(result, std::string())));
 }
 
 void WebContentDecryptionModuleSessionImpl::release(
     blink::WebContentDecryptionModuleResult result) {
   close(result);
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionMessage(
     const std::vector<uint8>& message,
     const GURL& destination_url) {
@@ skipping 53 matching lines @@
 
   DCHECK(web_session_id_.empty()) << "Session ID may not be changed once set.";
   web_session_id_ = web_session_id;
   return adapter_->RegisterSession(web_session_id_,
                                    weak_ptr_factory_.GetWeakPtr())
              ? blink::WebContentDecryptionModuleResult::NewSession
              : blink::WebContentDecryptionModuleResult::SessionAlreadyExists;
 }
 
 }  // namespace content