ReleaseSession() should call RemoveSession()

media/cdm/ppapi/cdm_adapter.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 "media/cdm/ppapi/cdm_adapter.h"
 
 #include "media/cdm/ppapi/cdm_file_io_impl.h"
 #include "media/cdm/ppapi/cdm_helpers.h"
 #include "media/cdm/ppapi/cdm_logging.h"
 #include "media/cdm/ppapi/supported_cdm_versions.h"
@@ skipping 367 matching lines @@
 
   cdm_->UpdateSession(promise_id,
                       web_session_id.data(),
                       web_session_id.length(),
                       response_ptr,
                       response_size);
 }
 
 void CdmAdapter::ReleaseSession(uint32_t promise_id,
                                 const std::string& web_session_id) {
-  cdm_->CloseSession(
+  cdm_->RemoveSession(

[ddorwin, 2014/08/22 23:59:44]

This CL makes a bunch of changes we'll want to undo (i.e. revert this CL) once
Pepper is properly piped. Can we instead limit the number of changes by adding
LegacyReleaseSession() to CdmWrapper, calling that here and having it call
Remove?

CloseSession() would never be called. It might require some more code in the
Wrapper, but it avoids unwanted changes here.

[ddorwin, 2014/08/23 00:14:30]

As discussed, even after piping everything through Pepper, we would still need
RemoveSession() to succeed for all CDM versions, so some such changes will be
necessary.

Maybe we should update the description, etc. to be more explicit that we are
changing the behavior of ReleaseSession() from Close to Remove. (And that
unprefixed Close() is thus broken for now.)

[jrummell, 2014/08/23 00:27:15]

Description updated.

       promise_id, web_session_id.data(), web_session_id.length());
 }
 
-void CdmAdapter::RemoveSession(uint32_t promise_id,
-                               const std::string& web_session_id) {
-  if (!cdm_->RemoveSession(
+void CdmAdapter::CloseSession(uint32_t promise_id,
+                              const std::string& web_session_id) {
+  if (!cdm_->CloseSession(
           promise_id, web_session_id.data(), web_session_id.length())) {
     // CDM_4 and CDM_5 don't support this method, so reject the promise.
     RejectPromise(promise_id, cdm::kNotSupportedError, 0, "Not implemented.");
   }
 }
 
 void CdmAdapter::GetUsableKeyIds(uint32_t promise_id,
                                  const std::string& web_session_id) {
   if (!cdm_->GetUsableKeyIds(
           promise_id, web_session_id.data(), web_session_id.length())) {
@@ skipping 952 matching lines @@
 }  // namespace media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new media::CdmAdapterModule();
 }
 
 }  // namespace pp