Move SessionIdAdapter out of WebContentDecryptionModuleImpl

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/callback_helpers.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "content/renderer/media/cdm_session_adapter.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 namespace content {
 
 WebContentDecryptionModuleSessionImpl::WebContentDecryptionModuleSessionImpl(
     uint32 session_id,
-    media::MediaKeys* media_keys,
     Client* client,
-    const SessionClosedCB& session_closed_cb)
-    : media_keys_(media_keys),
+    scoped_refptr<CdmSessionAdapter> adapter)
+    : adapter_(adapter),
       client_(client),
-      session_closed_cb_(session_closed_cb),
-      session_id_(session_id) {
-  DCHECK(media_keys_);
+      session_id_(session_id),
+      is_closed_(false) {
 }
 
 WebContentDecryptionModuleSessionImpl::
-~WebContentDecryptionModuleSessionImpl() {
+    ~WebContentDecryptionModuleSessionImpl() {
+  if (!is_closed_)
+    adapter_->RemoveSession(session_id_);
 }
 
 blink::WebString WebContentDecryptionModuleSessionImpl::sessionId() const {
   return web_session_id_;
 }
 
 void WebContentDecryptionModuleSessionImpl::initializeNewSession(
     const blink::WebString& mime_type,
     const uint8* init_data, size_t init_data_length) {
   // TODO(ddorwin): Guard against this in supported types check and remove this.
   // Chromium only supports ASCII MIME types.
   if (!IsStringASCII(mime_type)) {
     NOTREACHED();
     OnSessionError(media::MediaKeys::kUnknownError, 0);
     return;
   }
 
-  media_keys_->CreateSession(
+  adapter_->CreateSession(
       session_id_, UTF16ToASCII(mime_type), init_data, init_data_length);
 }
 
 void WebContentDecryptionModuleSessionImpl::update(const uint8* response,
                                                    size_t response_length) {
   DCHECK(response);
-  media_keys_->UpdateSession(session_id_, response, response_length);
+  adapter_->UpdateSession(session_id_, response, response_length);
 }
 
 void WebContentDecryptionModuleSessionImpl::release() {
-  media_keys_->ReleaseSession(session_id_);
+  adapter_->ReleaseSession(session_id_);
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionCreated(
     const std::string& web_session_id) {
   // Due to heartbeat messages, OnSessionCreated() can get called multiple
   // times.
   // TODO(jrummell): Once all CDMs are updated to support reference ids,
   // OnSessionCreated() should only be called once, and the second check can be
   // removed.
   blink::WebString id = blink::WebString::fromUTF8(web_session_id);
   DCHECK(web_session_id_.isEmpty() || web_session_id_ == id)
       << "Session ID may not be changed once set.";
   web_session_id_ = id;
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionMessage(
     const std::vector<uint8>& message,
     const std::string& destination_url) {
   client_->message(message.empty() ? NULL : &message[0],
                    message.size(),
                    GURL(destination_url));
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionReady() {
   client_->ready();
 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionClosed() {
   client_->close();
-  if (!session_closed_cb_.is_null())
-    base::ResetAndReturn(&session_closed_cb_).Run(session_id_);
+
+  // Now that the session is closed, no more events will come from the CDM.
+  is_closed_ = true;
+  adapter_->RemoveSession(session_id_);

[ddorwin, 2014/02/19 01:41:53]

Is there any advantage in de-registering the session before we're destroyed? If
not, it seems better to simplify the logic and remove a member. WDYT?

[jrummell, 2014/02/19 20:42:10]

Not really. I just added it here in case the Blink side doesn't bother to go
away until later. Removed.

 }
 
 void WebContentDecryptionModuleSessionImpl::OnSessionError(
     media::MediaKeys::KeyError error_code,
     int system_code) {
   client_->error(static_cast<Client::MediaKeyErrorCode>(error_code),
                  system_code);
 }
 
 }  // namespace content