EME: ProxyDecryptor creates MediaKeys instead of Decryptor.

media/base/decryptor.h

 // Copyright (c) 2012 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_BASE_DECRYPTOR_H_
 #define MEDIA_BASE_DECRYPTOR_H_
 
 #include <list>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/media_export.h"
 
 namespace media {
 
 class AudioDecoderConfig;
 class DataBuffer;
 class DecoderBuffer;
-class MediaKeys;
 class VideoDecoderConfig;
 class VideoFrame;
 
 // Decrypts (and decodes) encrypted buffer.
 //
 // All methods are called on the (video/audio) decoder thread. Decryptor
 // implementations must be thread safe when methods are called this way.
 // Depending on the implementation callbacks may be fired synchronously or
 // asynchronously.
 class MEDIA_EXPORT Decryptor {
  public:
   // TODO(xhwang): Replace kError with kDecryptError and kDecodeError.
   // TODO(xhwang): Replace kNeedMoreData with kNotEnoughData.
   enum Status {
     kSuccess,  // Decryption successfully completed. Decrypted buffer ready.
     kNoKey,  // No key is available to decrypt.
     kNeedMoreData,  // Decoder needs more data to produce a frame.
     kError  // Key is available but an error occurred during decryption.
   };
 
   // TODO(xhwang): Unify this with DemuxerStream::Type.
   enum StreamType {
     kAudio,
     kVideo
   };
 
   Decryptor();
   virtual ~Decryptor();
 
-  // Gets the MediaKey object associated with the Decryptor. Returns NULL if
-  // no MediaKey object is associated. The returned object is only guaranteed
-  // to be valid during the Decryptor's lifetime.
-  virtual MediaKeys* GetMediaKeys() = 0;
-
   // Indicates that a new key has been added to the MediaKeys object associated
   // with the Decryptor.
   typedef base::Callback<void()> NewKeyCB;
 
   // Registers a NewKeyCB which should be called when a new key is added to the
   // decryptor. Only one NewKeyCB can be registered for one |stream_type|.
   // If this function is called multiple times for the same |stream_type|, the
   // previously registered callback will be replaced. In other words,
   // registering a null callback cancels the originally registered callback.
   virtual void RegisterNewKeyCB(StreamType stream_type,
@@ skipping 110 matching lines @@
 // notification. When the decryptor is ready, notification will be sent
 // through the provided callback.
 // Calling this callback with a null callback cancels previously registered
 // decryptor ready notification. Any previously provided callback will be
 // fired immediately with NULL.
 typedef base::Callback<void(const DecryptorReadyCB&)> SetDecryptorReadyCB;
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECRYPTOR_H_