Revert 147169 - Add support for encrypted WebM files as defined in the RFC.

media/webm/webm_parser.cc

Index: media/webm/webm_parser.cc
===================================================================
--- media/webm/webm_parser.cc	(revision 147171)
+++ media/webm/webm_parser.cc	(working copy)
@@ -7,9 +7,6 @@
 // This file contains code to parse WebM file elements. It was created
 // from information in the Matroska spec.
 // http://www.matroska.org/technical/specs/index.html
-// This file contains code for encrypted WebM. Current WebM
-// encrypted request for comments specification is here
-// http://wiki.webmproject.org/encryption/webm-encryption-rfc
 
 #include <iomanip>
 
@@ -235,7 +232,6 @@
 };
 
 static const ElementIdInfo kContentEncryptionIds[] = {
-  {LIST, kWebMIdContentEncAESSettings},
   {UINT, kWebMIdContentEncAlgo},
   {BINARY, kWebMIdContentEncKeyID},
   {BINARY, kWebMIdContentSignature},
@@ -244,10 +240,6 @@
   {UINT, kWebMIdContentSigHashAlgo},
 };
 
-static const ElementIdInfo kContentEncAESSettingsIds[] = {
-  {UINT, kWebMIdAESSettingsCipherMode},
-};
-
 static const ElementIdInfo kCuesIds[] = {
   {LIST, kWebMIdCuePoint},
 };
@@ -384,7 +376,6 @@
   LIST_ELEMENT_INFO(kWebMIdContentEncoding, 4, kContentEncodingIds),
   LIST_ELEMENT_INFO(kWebMIdContentCompression, 5, kContentCompressionIds),
   LIST_ELEMENT_INFO(kWebMIdContentEncryption, 5, kContentEncryptionIds),
-  LIST_ELEMENT_INFO(kWebMIdContentEncAESSettings, 6, kContentEncAESSettingsIds),
   LIST_ELEMENT_INFO(kWebMIdCues, 1, kCuesIds),
   LIST_ELEMENT_INFO(kWebMIdCuePoint, 2, kCuePointIds),
   LIST_ELEMENT_INFO(kWebMIdCueTrackPositions, 3, kCueTrackPositionsIds),