Rename kWebMEncryptInitDataType to kWebMInitDataType

Review URL: https://codereview.chromium.org/610733002

Cr-Commit-Position: refs/heads/master@{#297949}

media/filters/chunk_demuxer_unittest.cc

@@ -1221,7 +1221,7 @@ TEST_F(ChunkDemuxerTest, Init) {
     if (is_audio_encrypted || is_video_encrypted) {
       int need_key_count = (is_audio_encrypted ? 1 : 0) +
                            (is_video_encrypted ? 1 : 0);
-      EXPECT_CALL(*this, NeedKeyMock(kWebMEncryptInitDataType, NotNull(),
+      EXPECT_CALL(*this, NeedKeyMock(kWebMInitDataType, NotNull(),
                                      DecryptConfig::kDecryptionKeySize))
           .Times(Exactly(need_key_count));
     }

media/filters/ffmpeg_demuxer.cc

@@ -170,7 +170,7 @@ FFmpegDemuxerStream::FFmpegDemuxerStream(FFmpegDemuxer* demuxer,
       return;
 
     encryption_key_id_.assign(enc_key_id);
-    demuxer_->FireNeedKey(kWebMEncryptInitDataType, enc_key_id);
+    demuxer_->FireNeedKey(kWebMInitDataType, enc_key_id);
   }
 }
 

media/filters/ffmpeg_demuxer_unittest.cc

@@ -358,7 +358,7 @@ TEST_F(FFmpegDemuxerTest, Initialize_MultitrackText) {
 }
 
 TEST_F(FFmpegDemuxerTest, Initialize_Encrypted) {
-  EXPECT_CALL(*this, NeedKeyCBMock(kWebMEncryptInitDataType, NotNull(),
+  EXPECT_CALL(*this, NeedKeyCBMock(kWebMInitDataType, NotNull(),
                                    DecryptConfig::kDecryptionKeySize))
       .Times(Exactly(2));
 

media/formats/webm/webm_crypto_helpers.h

@@ -11,7 +11,7 @@
 
 namespace media {
 
-const char kWebMEncryptInitDataType[] = "webm";
+const char kWebMInitDataType[] = "webm";
 
 // Fills an initialized DecryptConfig, which can be sent to the Decryptor if
 // the stream has potentially encrypted frames. Also sets |data_offset| which

media/formats/webm/webm_stream_parser.cc

@@ -277,7 +277,7 @@ int WebMStreamParser::ParseCluster(const uint8* data, int size) {
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   std::vector<uint8> key_id_vector(key_id.begin(), key_id.end());
-  need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector);
+  need_key_cb_.Run(kWebMInitDataType, key_id_vector);
 }
 
 }  // namespace media