Introduce CdmContext interface.

media/cdm/proxy_decryptor.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/proxy_decryptor.h"
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 24 matching lines @@
   DCHECK(!key_added_cb_.is_null());
   DCHECK(!key_error_cb_.is_null());
   DCHECK(!key_message_cb_.is_null());
 }
 
 ProxyDecryptor::~ProxyDecryptor() {
   // Destroy the decryptor explicitly before destroying the plugin.
   media_keys_.reset();
 }
 
 Decryptor* ProxyDecryptor::GetDecryptor() {

[ddorwin, 2014/11/21 05:04:27]

It doesn't matter much, but we _could_ possibly return a CdmContext instead.
Does that make the prefixed and unprefixed paths more similar?

[xhwang, 2014/11/21 05:15:41]

This will return a CdmContext in the next CL.

-  return media_keys_ ? media_keys_->GetDecryptor() : NULL;
+  return media_keys_ ? media_keys_->GetCdmContext()->GetDecryptor() : NULL;
 }
 
 #if defined(ENABLE_BROWSER_CDMS)
 int ProxyDecryptor::GetCdmId() {
-  return media_keys_->GetCdmId();
+  return media_keys_->GetCdmContext()->GetCdmId();
 }
 #endif
 
 bool ProxyDecryptor::InitializeCDM(CdmFactory* cdm_factory,
                                    const std::string& key_system,
                                    const GURL& security_origin) {
   DVLOG(1) << "InitializeCDM: key_system = " << key_system;
 
   DCHECK(!media_keys_);
   media_keys_ = CreateMediaKeys(cdm_factory, key_system, security_origin);
@@ skipping 253 matching lines @@
   bool is_persistent =
       session_type == PersistentSession || session_type == LoadSession;
   active_sessions_.insert(std::make_pair(web_session_id, is_persistent));
 
   // For LoadSession(), generate the SessionReady event.
   if (session_type == LoadSession)
     OnSessionReady(web_session_id);
 }
 
 }  // namespace media