Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Unified Diff: media/filters/pipeline_integration_test.cc

Issue 10539150: Add Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index c0a5b67e06076866961d8b86afb7db08aefc3689..6817505b785b5cbbe931769d89e14a83405a86ef 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -6,10 +6,10 @@
#include "base/bind.h"
#include "media/base/decoder_buffer.h"
+#include "media/base/decryptor_client.h"
#include "media/base/mock_filters.h"
#include "media/base/test_data_util.h"
#include "media/crypto/aes_decryptor.h"
-#include "media/crypto/decryptor_client.h"
#include "media/filters/chunk_demuxer_client.h"
namespace media {
@@ -112,9 +112,9 @@ class MockMediaSource : public ChunkDemuxerClient {
DecryptorClient* decryptor_client_;
};
-class MockDecryptorClientImpl : public DecryptorClient {
+class FakeDecryptorClient : public DecryptorClient {
public:
- MockDecryptorClientImpl() : decryptor_(this) {}
+ FakeDecryptorClient() : decryptor_(this) {}
AesDecryptor* decryptor() {
return &decryptor_;
@@ -196,7 +196,7 @@ class PipelineIntegrationTest
void StartPipelineWithEncryptedMedia(
MockMediaSource* source,
- MockDecryptorClientImpl* encrypted_media) {
+ FakeDecryptorClient* encrypted_media) {
pipeline_->Start(
CreateFilterCollection(source),
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
@@ -265,7 +265,7 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
TEST_F(PipelineIntegrationTest, EncryptedPlayback) {
MockMediaSource source("bear-320x240-encrypted.webm", 219726, true, true);
- MockDecryptorClientImpl encrypted_media;
+ FakeDecryptorClient encrypted_media;
StartPipelineWithEncryptedMedia(&source, &encrypted_media);
source.EndOfStream();
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698