Introduce CdmContext interface.

media/blink/cdm_session_adapter.h

 // 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.
 
 #ifndef MEDIA_BLINK_CDM_SESSION_ADAPTER_H_
 #define MEDIA_BLINK_CDM_SESSION_ADAPTER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/media_keys.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleSession.h"
 
 class GURL;
 
 namespace media {
 
 class CdmFactory;
+class Decryptor;
 class WebContentDecryptionModuleSessionImpl;
 
 // Owns the CDM instance and makes calls from session objects to the CDM.
 // Forwards the web session ID-based callbacks of the MediaKeys interface to the
 // appropriate session object. Callers should hold references to this class
 // as long as they need the CDM instance.
 class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> {
  public:
   CdmSessionAdapter();
 
@@ skipping 52 matching lines @@
 
   // Retrieves the key IDs for keys in the session that the CDM knows are
   // currently usable to decrypt media data.
   void GetUsableKeyIds(const std::string& web_session_id,
                        scoped_ptr<KeyIdsPromise> promise);
 
   // Returns the Decryptor associated with this CDM. May be NULL if no
   // Decryptor is associated with the MediaKeys object.
   // TODO(jrummell): Figure out lifetimes, as WMPI may still use the decryptor
   // after WebContentDecryptionModule is freed. http://crbug.com/330324
   Decryptor* GetDecryptor();

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

What do we use this for? Should this class be a CdmContext? It has GetCdmId too.
Or maybe it should return a CdmContext since we just pass these functions
through to one anyway.. Do whatever makes the most sense layering-wise.

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

This CL only introduce the new interface. In the next CL this will indeed be
updated to GetCdmContext().

 
   // Returns a prefix to use for UMAs.
   const std::string& GetKeySystemUMAPrefix() const;
 
 #if defined(ENABLE_BROWSER_CDMS)
   // Returns the CDM ID associated with the |media_keys_|. May be kInvalidCdmId
   // if no CDM ID is associated.
   int GetCdmId() const;
 #endif
 
@@ skipping 32 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<CdmSessionAdapter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmSessionAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_CDM_SESSION_ADAPTER_H_