Removed files that were renamed in a previous CL.

Review URL: https://chromiumcodereview.appspot.com/11830060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176250 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 19 insertions, 13 deletions

diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 2ee1297..8c18f7b 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -24,12 +24,18 @@ static const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\"";
 static const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\"";
 static const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\"";
 
-// Key used to encrypt video track in test file "bear-320x240-encrypted.webm".
+// Key used to encrypt test files.
 static const uint8 kSecretKey[] = {
   0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
   0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c
 };
 
+// The key ID for all encrypted files.
+static const uint8 kKeyId[] = {
+  0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+  0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35
+};
+
 static const int kAppendWholeFile = -1;
 
 // Constants for the Media Source config change tests.
@@ -357,13 +363,13 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
 }
 
 TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_Encrypted_WebM) {
-  MockMediaSource source("bear-320x240-16x9-aspect-av-enc_av.webm", kWebM,
+  MockMediaSource source("bear-320x240-16x9-aspect-av_enc-av.webm", kWebM,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media;
   StartPipelineWithEncryptedMedia(&source, &encrypted_media);
 
   scoped_refptr<DecoderBuffer> second_file =
-      ReadTestDataFile("bear-640x360-av-enc_av.webm");
+      ReadTestDataFile("bear-640x360-av_enc-av.webm");
 
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->GetData(), second_file->GetDataSize());
@@ -391,7 +397,7 @@ TEST_F(PipelineIntegrationTest,
   StartPipelineWithEncryptedMedia(&source, &encrypted_media);
 
   scoped_refptr<DecoderBuffer> second_file =
-      ReadTestDataFile("bear-640x360-av-enc_av.webm");
+      ReadTestDataFile("bear-640x360-av_enc-av.webm");
 
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->GetData(), second_file->GetDataSize());
@@ -416,7 +422,7 @@ TEST_F(PipelineIntegrationTest,
 // Config changes from clear to encrypted are not currently supported.
 TEST_F(PipelineIntegrationTest,
        MediaSource_ConfigChange_EncryptedThenClear_WebM) {
-  MockMediaSource source("bear-320x240-16x9-aspect-av-enc_av.webm", kWebM,
+  MockMediaSource source("bear-320x240-16x9-aspect-av_enc-av.webm", kWebM,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media;
   StartPipelineWithEncryptedMedia(&source, &encrypted_media);
@@ -443,11 +449,11 @@ TEST_F(PipelineIntegrationTest,
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
 TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_MP4) {
-  MockMediaSource source("bear.640x360_dash.mp4", kMP4, kAppendWholeFile);
+  MockMediaSource source("bear-640x360-av_frag.mp4", kMP4, kAppendWholeFile);
   StartPipelineWithMediaSource(&source);
 
   scoped_refptr<DecoderBuffer> second_file =
-      ReadTestDataFile("bear.1280x720_dash.mp4");
+      ReadTestDataFile("bear-1280x720-av_frag.mp4");
 
   source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
                       second_file->GetData(), second_file->GetDataSize());
@@ -475,7 +481,7 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {
 }
 
 TEST_F(PipelineIntegrationTest, EncryptedPlayback) {
-  MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 219816);
+  MockMediaSource source("bear-320x240-av_enc-av.webm", kWebM, 219816);
   FakeEncryptedMedia encrypted_media;
   StartPipelineWithEncryptedMedia(&source, &encrypted_media);
 
diff --git a/media/mp4/mp4_stream_parser_unittest.cc b/media/mp4/mp4_stream_parser_unittest.cc
index 66f3410..99aa206 100644
--- a/media/mp4/mp4_stream_parser_unittest.cc
+++ b/media/mp4/mp4_stream_parser_unittest.cc
@@ -124,18 +124,18 @@ class MP4StreamParserTest : public testing::Test {
 TEST_F(MP4StreamParserTest, TestUnalignedAppend) {
   // Test small, non-segment-aligned appends (small enough to exercise
   // incremental append system)
-  ParseMP4File("bear.1280x720_dash.mp4", 512);
+  ParseMP4File("bear-1280x720-av_frag.mp4", 512);
 }
 
 TEST_F(MP4StreamParserTest, TestBytewiseAppend) {
   // Ensure no incremental errors occur when parsing
-  ParseMP4File("bear.1280x720_dash.mp4", 1);
+  ParseMP4File("bear-1280x720-av_frag.mp4", 1);
 }
 
 TEST_F(MP4StreamParserTest, TestMultiFragmentAppend) {
   // Large size ensures multiple fragments are appended in one call (size is
   // larger than this particular test file)
-  ParseMP4File("bear.1280x720_dash.mp4", 768432);
+  ParseMP4File("bear-1280x720-av_frag.mp4", 768432);
 }
 
 TEST_F(MP4StreamParserTest, TestFlush) {
@@ -143,7 +143,7 @@ TEST_F(MP4StreamParserTest, TestFlush) {
   InitializeParser();
 
   scoped_refptr<DecoderBuffer> buffer =
-      ReadTestDataFile("bear.1280x720_dash.mp4");
+      ReadTestDataFile("bear-1280x720-av_frag.mp4");
   EXPECT_TRUE(AppendDataInPieces(buffer->GetData(), 65536, 512));
   parser_->Flush();
   EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
@@ -155,7 +155,7 @@ TEST_F(MP4StreamParserTest, TestReinitialization) {
   InitializeParser();
 
   scoped_refptr<DecoderBuffer> buffer =
-      ReadTestDataFile("bear.1280x720_dash.mp4");
+      ReadTestDataFile("bear-1280x720-av_frag.mp4");
   EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
                                  buffer->GetDataSize(),
                                  512));
diff --git a/media/test/data/bear-320x240-16x9-aspect-av-enc_av.webm b/media/test/data/bear-320x240-16x9-aspect-av-enc_av.webm
deleted file mode 100644
index f285f48..0000000
--- a/media/test/data/bear-320x240-16x9-aspect-av-enc_av.webm
+++ /dev/null
diff --git a/media/test/data/bear-320x240-encrypted.webm b/media/test/data/bear-320x240-encrypted.webm
deleted file mode 100644
index 0aa6c63..0000000
--- a/media/test/data/bear-320x240-encrypted.webm
+++ /dev/null
diff --git a/media/test/data/bear-640x360-av-enc_av.webm b/media/test/data/bear-640x360-av-enc_av.webm
deleted file mode 100644
index 2054ae0..0000000
--- a/media/test/data/bear-640x360-av-enc_av.webm
+++ /dev/null
diff --git a/media/test/data/bear.1280x720.mp4 b/media/test/data/bear.1280x720.mp4
deleted file mode 100644
index b424a0f..0000000
--- a/media/test/data/bear.1280x720.mp4
+++ /dev/null
diff --git a/media/test/data/bear.1280x720_dash.mp4 b/media/test/data/bear.1280x720_dash.mp4
deleted file mode 100644
index a05e1a0..0000000
--- a/media/test/data/bear.1280x720_dash.mp4
+++ /dev/null
diff --git a/media/test/data/bear.640x360_dash.mp4 b/media/test/data/bear.640x360_dash.mp4
deleted file mode 100644
index e5a045a..0000000
--- a/media/test/data/bear.640x360_dash.mp4
+++ /dev/null