summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfgalligan@chromium.org <fgalligan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 00:06:49 +0000
committerfgalligan@chromium.org <fgalligan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 00:06:49 +0000
commit865588887a6b64bdb7d63bac5d106c150b021998 (patch)
treebaac115ded3f85ce1cfad1aec202a86383c89239
parent48608c3160a8802748930ae58f9bfa6079643c61 (diff)
downloadchromium_src-865588887a6b64bdb7d63bac5d106c150b021998.zip
chromium_src-865588887a6b64bdb7d63bac5d106c150b021998.tar.gz
chromium_src-865588887a6b64bdb7d63bac5d106c150b021998.tar.bz2
Fix file size in EncryptedPlayback test.
- The binary file bear-320x240-encrypted.webm was updated but the the size for the MockMediaSource was the old file. BUG=132801 TEST=media_unittests Review URL: https://chromiumcodereview.appspot.com/10790147 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148250 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/filters/pipeline_integration_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 89b1a23..b36397d 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -286,7 +286,7 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
// TODO(fgalligan): Enable test when encrypted test data is updated and new
// decryption code is landed. http://crbug.com/132801
TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) {
- MockMediaSource source("bear-320x240-encrypted.webm", 219726, true, true);
+ MockMediaSource source("bear-320x240-encrypted.webm", 220730, true, true);
FakeDecryptorClient encrypted_media;
StartPipelineWithEncryptedMedia(&source, &encrypted_media);