Add Decryptor interface.

webkit/media/webmediaplayer_impl.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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains Pipeline which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // Pipeline would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 38 matching lines @@
 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/audio_renderer_sink.h"
+#include "media/base/decryptor.h"
 #include "media/base/filters.h"
 #include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
-#include "media/crypto/aes_decryptor.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvider.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 
 class RenderAudioSourceProvider;
 
 namespace WebKit {
 class WebAudioSourceProvider;
 class WebFrame;
 }
 
 namespace media {
-class AesDecryptor;
 class MediaLog;
 }
 
 namespace webkit_media {
 
 class MediaStreamClient;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerProxy;
 
 class WebMediaPlayerImpl
@@ skipping 138 matching lines @@
   void Repaint();
 
   void OnPipelineInitialize(media::PipelineStatus status);
   void OnPipelineSeek(media::PipelineStatus status);
   void OnPipelineEnded(media::PipelineStatus status);
   void OnPipelineError(media::PipelineStatus error);
   void OnDemuxerOpened();
   void OnKeyAdded(const std::string& key_system, const std::string& session_id);
   void OnKeyError(const std::string& key_system,
                   const std::string& session_id,
-                  media::AesDecryptor::KeyError error_code,
+                  media::Decryptor::KeyError error_code,
                   int system_code);
   void OnKeyMessage(const std::string& key_system,
                     const std::string& session_id,
                     scoped_array<uint8> message,
                     int message_length,
                     const std::string& default_url);
   void OnNeedKey(const std::string& key_system,
                  const std::string& session_id,
                  scoped_array<uint8> init_data,
                  int init_data_size);
@@ skipping 41 matching lines @@
 
   // The media pipeline and a bool tracking whether we have started it yet.
   //
   // TODO(scherkus): replace |started_| with a pointer check for |pipeline_| and
   // have WebMediaPlayerImpl return the default values to WebKit instead of
   // relying on Pipeline to take care of default values.
   scoped_refptr<media::Pipeline> pipeline_;
   bool started_;
 
   // The decryptor that manages decryption keys and decrypts encrypted frames.
-  scoped_ptr<media::AesDecryptor> decryptor_;
+  scoped_ptr<media::Decryptor> decryptor_;
 
   scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
 
   // Playback state.
   //
   // TODO(scherkus): we have these because Pipeline favours the simplicity of a
   // single "playback rate" over worrying about paused/stopped etc...  It forces
   // all clients to manage the pause+playback rate externally, but is that
   // really a bad thing?
   //
@@ skipping 31 matching lines @@
   WebKit::WebAudioSourceProvider* audio_source_provider_;
 
   bool is_local_source_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_