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"
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/media/cdm_result_promise.h"
 #include "content/renderer/media/cdm_session_adapter.h"
 #include "media/base/cdm_promise.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 namespace content {
 
 const char kCreateSessionUMAName[] = "CreateSession";
 
-typedef base::Callback<blink::WebContentDecryptionModuleResult::SessionStatus(
-    const std::string& web_session_id)> SessionInitializedCB;
-
-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 {
-    blink::WebContentDecryptionModuleResult::SessionStatus status =
-        new_session_created_cb_.Run(web_session_id);
-    web_cdm_result_.completeWithSession(status);
-  }
-
- private:
-  SessionInitializedCB new_session_created_cb_;
-};
-
 WebContentDecryptionModuleSessionImpl::WebContentDecryptionModuleSessionImpl(
     const scoped_refptr<CdmSessionAdapter>& adapter)
     : adapter_(adapter),
       is_closed_(false),
       weak_ptr_factory_(this) {
 }
 
 WebContentDecryptionModuleSessionImpl::
     ~WebContentDecryptionModuleSessionImpl() {
   if (!web_session_id_.empty())
@@ skipping 65 matching lines @@
               &WebContentDecryptionModuleSessionImpl::OnSessionInitialized,
               base::Unretained(this)))));
 }
 
 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)));
+  adapter_->UpdateSession(web_session_id_,
+                          response,
+                          response_length,
+                          scoped_ptr<media::SimpleCdmPromise>(
+                              new CdmResultPromise<>(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)));
+  adapter_->CloseSession(web_session_id_,
+                         scoped_ptr<media::SimpleCdmPromise>(
+                             new CdmResultPromise<>(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)));
+  adapter_->RemoveSession(web_session_id_,
+                          scoped_ptr<media::SimpleCdmPromise>(
+                              new CdmResultPromise<>(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