Introduce CdmContext interface.

media/blink/cdm_session_adapter.cc

 // Copyright 2014 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/blink/cdm_session_adapter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
@@ skipping 110 matching lines @@
   media_keys_->RemoveSession(web_session_id, promise.Pass());
 }
 
 void CdmSessionAdapter::GetUsableKeyIds(
     const std::string& web_session_id,
     scoped_ptr<KeyIdsPromise> promise) {
   media_keys_->GetUsableKeyIds(web_session_id, promise.Pass());
 }
 
 Decryptor* CdmSessionAdapter::GetDecryptor() {
-  return media_keys_->GetDecryptor();
+  return media_keys_->GetCdmContext()->GetDecryptor();
 }
 
 const std::string& CdmSessionAdapter::GetKeySystemUMAPrefix() const {
   return key_system_uma_prefix_;
 }
 
 #if defined(ENABLE_BROWSER_CDMS)
 int CdmSessionAdapter::GetCdmId() const {
-  return media_keys_->GetCdmId();
+  return media_keys_->GetCdmContext()->GetCdmId();
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 void CdmSessionAdapter::OnSessionMessage(const std::string& web_session_id,
                                          const std::vector<uint8>& message,
                                          const GURL& destination_url) {
   WebContentDecryptionModuleSessionImpl* session = GetSession(web_session_id);
   DLOG_IF(WARNING, !session) << __FUNCTION__ << " for unknown session "
                              << web_session_id;
   if (session)
@@ skipping 44 matching lines @@
 WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession(
     const std::string& web_session_id) {
   // Since session objects may get garbage collected, it is possible that there
   // are events coming back from the CDM and the session has been unregistered.
   // We can not tell if the CDM is firing events at sessions that never existed.
   SessionMap::iterator session = sessions_.find(web_session_id);
   return (session != sessions_.end()) ? session->second.get() : NULL;
 }
 
 }  // namespace media